Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java

@@ -57,6 +57,13 @@ public interface ISysUserInfoService {
     void refreshRefUserOrganize(Long userInfoId, Long organizeId, String userName);
 
     /**
+     * 刷新用户账号信息
+     * @param userInfoId
+     */
+    @ApiOperation(value = "刷新用户账号信息",notes = "根据UserInfoId 刷新用户账号信息")
+    void refreshUserInfoUserNum(Long userInfoId);
+
+    /**
      * 根据Key 删除数据
      * @param id
      */

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java

@@ -103,6 +103,7 @@ public class SysUserController extends CoreBaseController{
 
             // 更新用户关系
             sysUserService.refreshSysRefUserRole(user,StringTool.getArrayLong(roleIds),getSessionUser().getUserName());
+            sysUserInfoService.refreshUserInfoUserNum(userInfo.getId());
 
             return ResultBean.success("操作成功")
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
@@ -290,6 +291,7 @@ public class SysUserController extends CoreBaseController{
             ValidatorBean.checkNotNull(id, "用户id 不能为空");
 
             sysUserService.deleteSysUserById(Long.parseLong(id));
+            sysUserInfoService.refreshUserInfoUserNum(Long.parseLong(id));
             return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java

@@ -195,6 +195,19 @@ public class SysUserInfoService implements ISysUserInfoService {
     }
 
     @Override
+    @ApiOperation(value = "刷新用户账号信息",notes = "根据UserInfoId 刷新用户账号信息")
+    public void refreshUserInfoUserNum(Long userInfoId) {
+        LOGGER.info("用户信息 SysUserInfo userInfoId:{}",userInfoId);
+        SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId);
+        if(userInfo != null){
+            int count = sysUserRepository.findByPropertyCount("userInfoId", userInfo.getId());
+            userInfo.setUserNum(count);
+            sysUserInfoRDao.save(userInfo);
+
+        }
+    }
+
+    @Override
     public void deleteSysUserInfoById(Long id) {
         LOGGER.info("用户信息 SysUserInfo id:{}",id);
         sysUserInfoRDao.deleteById(id);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
+import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
 import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
@@ -76,6 +77,9 @@ public class SysUserService implements ISysUserService {
     @Autowired
     private SysPositionRepository sysPositionRDao;
 
+    @Autowired
+    private ISysUserInfoService sysUserInfoService;
+
     @Override
     @ApiOperation(value = "用户登录", notes = "用户登录功能实现")
     public SessionUser queryUserLogin(String loginName, String password, String languageCode) throws AuthenticationException {
@@ -260,6 +264,7 @@ public class SysUserService implements ISysUserService {
         if(null != list && list.size() > 0){
             for (SysUser sysUser : list) {
                 sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
+                sysUserInfoService.refreshUserInfoUserNum(sysUser.getUserInfoId());
             }
 
             sysUserRDao.saveAll(list);