forked from moral

blame | history | patch | commit | commitdiff | ignore whitespace
cjl
2023-09-26 2573d09a4a305b7cb4ba9ab82daa8a8e2a4cdeb4 
 screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java


@@ -30,14 +30,17 @@


import com.moral.api.entity.Group;


import com.moral.api.entity.Menu;


import com.moral.api.entity.Organization;


import com.moral.api.entity.ResponsibilityUnit;


import com.moral.api.entity.User;


import com.moral.api.entity.UserGroup;


import com.moral.api.entity.UserLog;


import com.moral.api.mapper.MenuMapper;


import com.moral.api.mapper.ResponsibilityUnitMapper;


import com.moral.api.mapper.UserGroupMapper;


import com.moral.api.mapper.UserLogMapper;


import com.moral.api.mapper.UserMapper;


import com.moral.api.pojo.bo.UserBO;


import com.moral.api.service.ResponsibilityUnitService;


import com.moral.api.service.UserService;


import com.moral.api.utils.OperationLogUtils;


import com.moral.constant.Constants;


@@ -76,6 +79,9 @@




    @Autowired


    private OperationLogUtils operationLogUtils;




    @Autowired


    private ResponsibilityUnitService responsibilityUnitService;




    @Value("${AES.KEY}")


    private String AESKey;


@@ -125,6 +131,7 @@


        userInfo.put("userName", userBo.getUserName());


        userInfo.put("email", userBo.getEmail());


        userInfo.put("mobile", userBo.getMobile());


        userInfo.put("unitId",userBo.getUnitId());


        userInfo.put("wechat", userBo.getWechat());


        userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));


        userInfo.put("isAdmin", userBo.getIsAdmin());


@@ -281,6 +288,8 @@


            result.put("msg", ResponseCodeEnum.MOBILE_INVALID.getMsg());


            return result;


        }


        ResponsibilityUnit responsibilityUnit = responsibilityUnitService.selectAreaUnit(user.getUnitCode());


        user.setUnitId(responsibilityUnit.getUnitId());


        //密码加密


        user.setPassword(MD5Utils.saltMD5(password));


        Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");


@@ -400,6 +409,8 @@


            String deleteToken = TokenUtils.hget(userId).toString();


            TokenUtils.destoryToken(userId, deleteToken);


        }


        ResponsibilityUnit responsibilityUnit = responsibilityUnitService.selectAreaUnit(user.getUnitCode());


        user.setUnitId(responsibilityUnit.getUnitId());


        userMapper.updateById(user);




        //日志