blame | history | patch | commit | commitdiff | show whitespace
cjl
2023-10-27 165f11c315a0283c6cf32572dddee5c81351cad8 
 screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java


@@ -11,6 +11,9 @@


import com.moral.api.entity.*;


import com.moral.api.mapper.*;


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


import com.moral.api.pojo.enums.FileTableEnum;


import com.moral.api.pojo.vo.file.FileVo;


import com.moral.api.service.FileTableService;


import com.moral.api.service.UserService;


import com.moral.api.utils.OperationLogUtils;


import com.moral.api.utils.WechatUtils;


@@ -18,6 +21,7 @@


import com.moral.constant.ResponseCodeEnum;


import com.moral.util.*;


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.collections4.CollectionUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.stereotype.Service;


@@ -53,6 +57,9 @@




    @Autowired


    private UserLogMapper userLogMapper;




    @Autowired


    private FileTableService fileTableService;




    @Autowired


    private OperationLogUtils operationLogUtils;


@@ -115,6 +122,8 @@


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


            result.put("userId", userBo.getId());


            result.put("account", userBo.getAccount());


            List<FileVo> listFile =  fileTableService.list(userBo.getId(), FileTableEnum.APP_ALLOCATION.value);


            result.put("file", CollectionUtils.isNotEmpty(listFile)?listFile.get(0):new FileVo());


            result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"未选择责任单位");


        } catch (Exception e) {


            log.error("token生成异常：" + e.getMessage());


@@ -183,6 +192,8 @@


            result.put("token", token);


            result.put("userName", user.getUserName());


            result.put("unitId",user.getUnitId());


            List<FileVo> listFile =  fileTableService.list(user.getId(), FileTableEnum.APP_ALLOCATION.value);


            result.put("file", CollectionUtils.isNotEmpty(listFile)?listFile.get(0):new FileVo());


            result.put("userId", user.getId());


            result.put("account", user.getAccount());


            result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"未选择责任单位");