From 4695b1501f8dd6850730aeb4131f88fef0e14c9f Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 12 十二月 2023 10:28:56 +0800
Subject: [PATCH] 物品导入

---
 consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java |   39 ++++++++++++++++++++-------------------
 1 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index 8c26bf4..2bb2d93 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -39,7 +39,7 @@
 import com.consum.base.pojo.response.FinSysTenantVO;
 import com.consum.base.pojo.response.UserVO;
 import com.consum.base.service.FinSysTenantDepartmentService;
-import com.consum.base.service.FinSysTenantServiceImpl;
+import com.consum.base.service.FinSysTenantService;
 import com.consum.base.service.FinSysTenantUserServiceImpl;
 import com.consum.model.po.FinSysTenant;
 import com.consum.model.po.FinSysTenantDepartment;
@@ -82,7 +82,7 @@
 
     private UserServiceImpl userService;
 
-    private FinSysTenantServiceImpl finSysTenantService;
+    private FinSysTenantService finSysTenantService;
 
     private RoleServiceImpl roleService;
 
@@ -95,7 +95,7 @@
     }
 
     @Autowired
-    public FinSysTenantUserController(FinSysTenantServiceImpl finSysTenantService,
+    public FinSysTenantUserController(FinSysTenantService finSysTenantService,
         FinSysTenantUserServiceImpl finSysTenantUserService, RoleServiceImpl roleService) {
         this.finSysTenantUserService = finSysTenantUserService;
         this.finSysTenantService = finSysTenantService;
@@ -205,7 +205,7 @@
     @PostMapping("/add")
     @Transactional(rollbackFor = Exception.class)
     public ResponseValue add() {
-        FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+        FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
         FinSysTenantUser tenantUser = new FinSysTenantUser();
         CommonUtil.copyProperties(user, tenantUser);
 
@@ -242,34 +242,35 @@
         }
         tenantUser.setUserPhone(encPhone);
         // 鎬庝箞鑾峰彇宸︿晶鏈烘瀯鏍戞暟鎹�
-        tenantUser.setSysDeptId(3L); // 瀵瑰簲骞冲彴鏈烘瀯id 榛樿涓哄钩鍙扮鐞�
+        // tenantUser.setSysDeptId(3L); // 瀵瑰簲骞冲彴鏈烘瀯id 榛樿涓哄钩鍙扮鐞�
         this.finSysTenantUserService.insert(tenantUser);
+
         // 鎻掑叆骞冲彴鐢ㄦ埛
         S_user_core userCore = new S_user_core();
-        userCore.setId(user.getSysUserId());
+        userCore.setId(tenantUser.getSysUserId());
         userCore.setDept_id(3L); // 閮ㄩ棬id锛岀洰鍓嶅啓姝�
-        userCore.setOrg_id(user.getSysDeptId()); // 鏈烘瀯id
+        userCore.setOrg_id(tenantUser.getSysDeptId()); // 鏈烘瀯id
         userCore.setOrg_id(1L);
-        userCore.setUser_name(user.getUserCode()); // 鐢ㄦ埛璐﹀彿
-        userCore.setNick_name(user.getUserName());
+        userCore.setUser_name(tenantUser.getUserCode()); // 鐢ㄦ埛璐﹀彿
+        userCore.setNick_name(tenantUser.getUserName());
         // 鐢ㄦ埛绫诲瀷 鍏堥粯璁よ缃负2
         userCore.setUser_type(2);
         userCore.setPhonenumber(encPhone);
-        userCore.setSex(user.getSex().toString());
+        userCore.setSex(tenantUser.getSex().toString());
         // 鍒濆鍖栧瘑鐮� 123456
         String pws = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
         userCore.setPassword(pws);
         // 骞冲彴鐢ㄦ埛琛ㄥ拰绯荤粺鐢ㄦ埛 琛ㄧ姸鎬佺浉鍙�
-        if (user.getStatus() == 0) {
-            user.setStatus(1);
+        if (tenantUser.getStatus() == 0) {
+            tenantUser.setStatus(1);
         } else {
-            user.setStatus(0);
+            tenantUser.setStatus(0);
         }
-        userCore.setStatus(user.getStatus());
+        userCore.setStatus(tenantUser.getStatus());
         userCore.setDel_flag(0);
         userCore.setCreate_by(this.getCurrentUser().getUser_name());
         userCore.setCreate_time(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
-        userCore.setRemark(user.getRemark());
+        userCore.setRemark(tenantUser.getRemark());
         userCore.setType(1);
         userCore.setBind_client_id("0");
         userCore.setBind_wechat(0);
@@ -293,7 +294,7 @@
         // 灏戣鑹瞚d
         List<Long> roleList = user.getRoleList(); // 鏈烘瀯id 澶氫釜
         if (!CollectionUtils.isEmpty(roleList)) {
-            Long sysUserId = user.getSysUserId(); // 鐢ㄦ埛id
+            Long sysUserId = tenantUser.getSysUserId(); // 鐢ㄦ埛id
             this.finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);
         }
         // this.getFinCustomerCache().remove();
@@ -486,7 +487,7 @@
     @PostMapping("/update")
     @Transactional(rollbackFor = Exception.class)
     public ResponseValue update() {
-        FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+        FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
         FinSysTenantUser tenantUser = new FinSysTenantUser();
         CommonUtil.copyProperties(user, tenantUser);
 
@@ -683,8 +684,8 @@
      */
     @PostMapping("/updRole")
     public ResponseValue updRole() {
-        FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
-        FinSysTenantUserParam tenantUser = new FinSysTenantUserParam();
+        FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
+        FinSysTenantUser tenantUser = new FinSysTenantUser();
         CommonUtil.copyProperties(user, tenantUser);
         user = tenantUser;
 

--
Gitblit v1.9.1