From 0fdac321828bffa833f7d0155a5c147d23bd78d8 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 15 十二月 2023 12:26:25 +0800
Subject: [PATCH] 1.修改调拨查询物品分类接口 2.解决超级管理员无法登录 3.修改手机号

---
 consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java b/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
index c7a8918..4c40b21 100644
--- a/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
@@ -41,7 +41,7 @@
  * @Description
  * @Version 1.0
  **/
-@Api(value = "搴撶鍛�", tags = "搴撶鍛�")
+@Api(value = "閮ㄩ棬鎶ュ簾", tags = "閮ㄩ棬鎶ュ簾")
 @RestController
 @RequestMapping("/pc/l/wh/form/scrapped")
 public class DepFormScrappedController extends BaseController {
@@ -57,6 +57,7 @@
         param = query;
 
         FinSysTenantUser sysInfo = this.getSysInfo();
+
         return depFormScrappedService.add(param, this.getCurrentUser(), sysInfo);
     }
 
@@ -171,8 +172,6 @@
         map.put("code", businessFormCode);
         map.put("date", DateUtils.toShowDate(dealTime));
         map.put("name", operatorName);
-        map.put("countNum", 0);
-        map.put("totalAmount", 0);
         map.put("dataList", export);
 
         Workbook workbook = ExcelExportUtil.exportExcel(exportParams, map);
@@ -207,6 +206,27 @@
         return ResponseValue.success(export);
     }
 
+    @GetMapping("/deptListByModel2")
+    public ResponseValue deptListByModel2() {
+        LDeptFormScrappedQry param = CommonUtil.getObjFromReq(LDeptFormScrappedQry.class);
+        LDeptFormScrappedQry query = new LDeptFormScrappedQry();
+        CommonUtil.copyProperties(param, query);
+        param = query;
+
+        FinSysTenantUser sysInfo = getSysInfo();
+        if (sysInfo == null) {
+            throw new RuntimeException("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+        }
+        /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+        String tenantId = sysInfo.getTenantId();
+        String paramAgencyId = param.getAgencyId();
+        if (StringUtils.isEmpty(paramAgencyId) || !paramAgencyId.startsWith(tenantId)) {
+            param.setAgencyId(tenantId);
+        }
+        return ResponseValue.success(depFormScrappedService.listByModel2(param));
+    }
+
+
 //    public static void main(String[] args) {
 //        TemplateExportParams exportParams = new TemplateExportParams("D:\\MyProjects\\jmy\\浣庡�兼槗鑰楀搧\\low-consum-manage\\deploy-jar-single\\src\\main\\resources\\import\\deptScrapped.xlsx");
 //        exportParams.setHeadingStartRow(2);

--
Gitblit v1.9.1