Explorar o código

修改变更经办人登录

cuixq %!s(int64=3) %!d(string=hai) anos
pai
achega
4df3bb6809

+ 28 - 7
tianhu-system/src/main/java/com/tianhu/system/controller/OwnSysUserController.java

@@ -20,6 +20,7 @@ import com.tianhu.system.api.domain.SysRole;
 import com.tianhu.system.api.domain.SysUser;
 import com.tianhu.system.api.model.LoginUser;
 import com.tianhu.system.domain.*;
+import com.tianhu.system.mapper.OwnSysUserMapper;
 import com.tianhu.system.mapper.SysProductMenuMapper;
 import com.tianhu.system.service.*;
 import com.tianhu.system.utils.RegularUtil;
@@ -78,6 +79,9 @@ public class OwnSysUserController extends BaseController
     @Autowired
     private IPubFileInfService pubFileInfService;
 
+    @Autowired
+    private OwnSysUserMapper ownSysUserMapper;
+
     /**
      * 获取用户列表
      */
@@ -409,16 +413,21 @@ public class OwnSysUserController extends BaseController
         //查询经办人待办
         LambdaQueryWrapper<ZcHandlerChange> handleChange = new LambdaQueryWrapper<>();
         handleChange.eq(ZcHandlerChange::getZhcCompanyId,CommonUtil.objToString(map.get("scyId")));
-        handleChange.eq(ZcHandlerChange::getZhcToUserId,CommonUtil.objToString(map.get("userId")));
         handleChange.eq(ZcHandlerChange::getZhcStatus,"00");
         List<ZcHandlerChange> zcHandlerChange = zcHandlerChangeService.findZcHandlerChanges(handleChange);
-        Map maps = new HashMap();
-        if(zcHandlerChange.size()>0){
-            maps.put("handleChange","00");
-        }else{
-            maps.put("handleChange","01");
+        List<Map> result = new ArrayList<>();
+        for(int i=0;i<zcHandlerChange.size();i++){
+            Map maps = new HashMap();
+            if(zcHandlerChange.size()>0){
+                maps.put("handleChange","00");
+                maps.put("userId",map.get("userId"));
+            }else{
+                maps.put("handleChange","01");
+                maps.put("userId",map.get("userId"));
+            }
+            result.add(maps);
         }
-        return R.ok(maps);
+        return R.ok(result);
     }
 
     /**
@@ -696,6 +705,18 @@ public class OwnSysUserController extends BaseController
         //经办人
         rel.setSucrHandler("1");
         sysUserCompanyRelService.update(rel,relLambdaQueryWrapper);
+
+        // 清空远经办人的token
+        Map<String, Object> param = new HashMap<>();
+        param.put("userId", zcHandlerChange.get(0).getZhcUserId());
+        String lastToken = ownSysUserMapper.getLoginToken(param);
+
+        LoginUser lastLoginInfo = tokenService.getLoginUser(lastToken);
+        if(lastLoginInfo!=null){
+            lastLoginInfo.setSingle("2");
+            tokenService.setLoginUser(lastLoginInfo);
+        }
+
         return R.ok();
     }
     /**