Merge branch 'dev/20220228_v3.0.1通用版_渠道管理第一期' into test

bus-interceptor/src/main/resources/application.properties

@@ -1 +1 @@
-url =/userManage/loadByUsername,/redisRefresh,/loginLogHandle,/logManage/**
+url =/userManage/loadByUsername,/redisRefresh,/loginLogHandle,/logManage/**,/error

daqe-center/src/main/java/com/lantone/daqe/facade/BlockLossManagementFacade.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.collect.Lists;
 import com.lantone.common.dto.GetOperationLogDTO;
 import com.lantone.common.enums.IsDeleteEnum;
+import com.lantone.common.exception.Asserts;
 import com.lantone.common.util.BeanUtil;
 import com.lantone.common.util.DateUtil;
 import com.lantone.common.util.EntityUtil;
@@ -117,6 +118,11 @@ public class BlockLossManagementFacade {
             hospitalId = SysUserUtils.getCurrentHospitalId();
             principleId = SysUserUtils.getCurrentPrincipleId();
         }
+        //获取his对应的数据
+        List<HisMedicalRecordDTO> hisMedicalRecords = getHisMedicalRecords(dataCompareVO);
+        if (ListUtil.isEmpty(hisMedicalRecords) && StringUtil.isNotBlank(dataCompareVO.getBehospitalCode())) {
+            Asserts.fail("未查询到该患者信息");
+        }
 
 
         //====1.删除当前时间段的对比记录（未核查的）
@@ -190,8 +196,7 @@ public class BlockLossManagementFacade {
         //====2.某时间的数据对比
         //=====2.1获取数据
 
-        //获取his对应的数据
-        List<HisMedicalRecordDTO> hisMedicalRecords = getHisMedicalRecords(dataCompareVO);
+
         Map<String, HisMedicalRecordDTO> hisMedicalRecordMap = EntityUtil.makeEntityMap(hisMedicalRecords, "behospitalCode");
 
         //获取操作记录数据
@@ -298,17 +303,17 @@ public class BlockLossManagementFacade {
                 updateWrapper.set("gmt_modified", DateUtil.now())
                         .set("modifier", finalPrincipleId != null ? finalPrincipleId + "" : "0")
                         .notIn("is_audited", LossIsAuditedEnum.NOT_AUDITED.getKey())
-                        .eq(StringUtil.isNotBlank(data.getRecId()),"rec_id",data.getRecId())
+                        .eq(StringUtil.isNotBlank(data.getRecId()), "rec_id", data.getRecId())
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("behospital_code",data.getBehospitalCode())
+                        .eq("behospital_code", data.getBehospitalCode())
                         .ge(dataCompareVO.getStartDate() != null && StringUtil.isBlank(dataCompareVO.getBehospitalCode()), "behospital_date", dataCompareVO.getStartDate())
                         .le(dataCompareVO.getEndDate() != null && StringUtil.isBlank(dataCompareVO.getBehospitalCode()), "behospital_date", dataCompareVO.getEndDate())
                         .eq(finalHospitalId != null, "hospital_id", finalHospitalId);
                 //更新病案首页或文书
-                if(StringUtil.isNotBlank(data.getRecId())){
+                if (StringUtil.isNotBlank(data.getRecId())) {
                     updateWrapper.notIn("loss_type", LossTypeEnum.CODE_LOSS.getKey());
-                }else {//更新病历
-                    updateWrapper.eq("loss_type",LossTypeEnum.CODE_LOSS.getKey());
+                } else {//更新病历
+                    updateWrapper.eq("loss_type", LossTypeEnum.CODE_LOSS.getKey());
                 }
                 blocklossResultFacade.update(updateWrapper);
             });
@@ -503,7 +508,7 @@ public class BlockLossManagementFacade {
         //查询已恢复的
         List<String> medCode = behospitalInfoFacade.list(new QueryWrapper<BehospitalInfo>()
                 .select("DISTINCT behospital_code")
-                .in("behospital_code",lossCodes)
+                .in("behospital_code", lossCodes)
                 .eq(hospitalId != null, "hospital_id", hospitalId)
                 .eq("is_deleted", IsDeleteEnum.N.getKey())).stream().map(BehospitalInfo::getBehospitalCode).collect(Collectors.toList());
         //去除已恢复得到已丢失的
@@ -733,7 +738,7 @@ public class BlockLossManagementFacade {
      */
     private List<HisMedicalRecordDTO> getHisMedicalRecords(DataCompareVO dataCompareVO) {
         //技术服务部接口 /balance/data/getDataCount
-//        return hisDataService.getDataCount(dataCompareVO).getData();
+        //        return hisDataService.getDataCount(dataCompareVO).getData();
         //###模拟
         return hisDataManagementFacade.getHisMedicalRecords(dataCompareVO);
     }
@@ -852,37 +857,11 @@ public class BlockLossManagementFacade {
      */
     private Integer getHisDataCount(BlockLossTypeGatherVO blockLossTypeGatherVO) {
         //获取his数量
-//        return  hisDataService.getCount(blockLossTypeGatherVO).getData();
+        //        return  hisDataService.getCount(blockLossTypeGatherVO).getData();
         //模拟his
         return hisDataManagementFacade.gethisDataCount(blockLossTypeGatherVO);
     }
 
-    /**
-     * 获取这段时间内his的数据量
-     *
-     * @param hisMedicalRecords
-     * @Return java.lang.Integer
-     */
-    private Integer getHisMedicalRecordsCount(List<HisMedicalRecordDTO> hisMedicalRecords) {
-
-        AtomicReference<Integer> num = new AtomicReference<>(0);
-        if (ListUtil.isNotEmpty(hisMedicalRecords)) {
-            hisMedicalRecords.stream().forEach(hisMedicalRecordDTO -> {
-                //病历+1
-                num.getAndSet(num.get() + 1);
-                //病案首页+1
-                if (StringUtil.isNotEmpty(hisMedicalRecordDTO.getHomePageId())) {
-                    num.getAndSet(num.get() + 1);
-                }
-                //文书
-                if (ListUtil.isNotEmpty(hisMedicalRecordDTO.getHisRecs())) {
-                    num.getAndSet(num.get() + hisMedicalRecordDTO.getHisRecs().size());
-                }
-
-            });
-        }
-        return num.get();
-    }
 
     /**
      * 数据补录

daqe-center/src/main/java/com/lantone/daqe/facade/ColumnResultManagementFacade.java

@@ -161,6 +161,9 @@ public class ColumnResultManagementFacade {
     public Boolean updateColumnResult(UpdateColumnResultVO updateColumnResultVO) {
         Long principleId = SysUserUtils.getCurrentPrincipleId();
         ColumnResult columnResultFacadeById = columnResultFacade.getById(updateColumnResultVO.getId());
+        if(columnResultFacadeById==null){
+            Asserts.fail("规则已被删除，无法进行该操作。");
+        }
         //先修改副表
         //非空校验结果表
         Long resultId = columnResultFacadeById.getResultId();
@@ -562,7 +565,7 @@ public class ColumnResultManagementFacade {
                     nonnullResultUp = upNonnullResult(nonnullResult, getTableColumnInfoDTO, principleId);
                 }
                 //不是必填则判断是否已有数据存在于结果表中，若存在则修改
-                if (NonnullStatusEnum.NOT_NONNULL.equals(nonnullInfo.getIsRequired())) {
+                if ((NonnullStatusEnum.NOT_NONNULL.getKey()).equals(nonnullInfo.getIsRequired())) {
                     if (columnResultUp != null) {
                         columnResultUp.setIsSolved(SolvedStatusEnum.IS_SOLVED.getKey());
                         nonnullResultUp.setIsSolved(SolvedStatusEnum.IS_SOLVED.getKey());
@@ -573,65 +576,66 @@ public class ColumnResultManagementFacade {
                     } else {
                         continue;
                     }
-                }
-                //符合非空情况则判断是否已有数据存在于结果表中，若存在则修改
-                if (StringUtil.isNotEmpty(val)) {
-                    if (columnResult != null) {
-                        columnResultUp.setIsSolved(SolvedStatusEnum.IS_SOLVED.getKey());
-                        nonnullResultUp.setIsSolved(SolvedStatusEnum.IS_SOLVED.getKey());
-                        //加入修改集合
-                        upColumnResultList.add(columnResultUp);
-                        upNonnullResultList.add(nonnullResultUp);
-                    } else {
-                        continue;
-                    }
-                }
-                //符合非空情况则判断是否已有数据存在于结果表中，若存在则更新时间，否则则新增
-                if (StringUtil.isEmpty(val)) {
-                    if (columnResult != null) {
-                        columnResultUp.setIsSolved(SolvedStatusEnum.NOT_SOLVED.getKey());
-                        nonnullResultUp.setIsSolved(SolvedStatusEnum.NOT_SOLVED.getKey());
-                        //加入修改集合
-                        upColumnResultList.add(columnResultUp);
-                        upNonnullResultList.add(nonnullResultUp);
-                    } else {
-                        //新增
-                        //为空加入非空校验结果表
-                        NonnullResult nonnullResultAdd = new NonnullResult();
-                        nonnullResultAdd.setHospitalId(getTableColumnInfoDTO.getHospitalId());
-                        nonnullResultAdd.setBehospitalCode(getTableColumnInfoDTO.getBehospitalCode());
-                        nonnullResultAdd.setModeId(getTableColumnInfoDTO.getModeId());
-                        nonnullResultAdd.setModeName(getTableColumnInfoDTO.getModeName());
-                        if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
-                            nonnullResultAdd.setHosptialDatatmpCode(getTableColumnInfoDTO.getRecId());
-                        }
-                        if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
-                            nonnullResultAdd.setHosptialDatatmpName(getTableColumnInfoDTO.getRecTitle());
-                        }
-                        nonnullResultAdd.setColumnId(nonnullInfo.getColumnId());
-                        nonnullResultAdd.setBehospitalDate(getTableColumnInfoDTO.getBehospitalDate());
-                        nonnullResultAdd.setTableCname(columnInfo.getTableCname());
-                        nonnullResultAdd.setHospitalDataCode(getTableColumnInfoDTO.getNumberId());
-                        nonnullResultAdd.setBehospitalDate(getTableColumnInfoDTO.getBehospitalDate());
-                        nonnullResultAdd.setTableEname(columnInfo.getTableEname());
-                        nonnullResultAdd.setColumnCname(columnInfo.getColumnCname());
-                        nonnullResultAdd.setColumnEname(columnInfo.getColumnEname());
-                        nonnullResultAdd.setTableVal(getTableColumnInfoDTO.getVal());
-                        if (principleId != null) {
-                            nonnullResultAdd.setCreator(principleId.toString());
+                } else {
+                    //符合非空情况则判断是否已有数据存在于结果表中，若存在则修改
+                    if (StringUtil.isNotEmpty(val)) {
+                        if (columnResult != null) {
+                            columnResultUp.setIsSolved(SolvedStatusEnum.IS_SOLVED.getKey());
+                            nonnullResultUp.setIsSolved(SolvedStatusEnum.IS_SOLVED.getKey());
+                            //加入修改集合
+                            upColumnResultList.add(columnResultUp);
+                            upNonnullResultList.add(nonnullResultUp);
+                        } else {
+                            continue;
                         }
-                        nonnullResultAdd.setTableId(getTableColumnInfoDTO.getTableId());
-                        nonnullResultAdd.setIsSolved(SolvedStatusEnum.NOT_SOLVED.getKey());
-                        nonnullResultAdd.setSolveTime(new Date());
-                        nonnullResultAdd.setIsAudited(AuditStatusEnum.NOT_AUDIT.getKey());
-                        nonnullResultAdd.setGmtCreate(new Date());
-                        nonnullResultAdd.setGmtModified(new Date());
-                        addNonnullResultList.add(nonnullResultAdd);
-                        //加入总结果表
-                        ColumnResult columnResultAdd = addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, ColumnResultTypeEnum.NONNULL_TYPE.getKey(), principleId);
-                        addColumnResultList.add(columnResultAdd);
                     }
+                    //符合非空情况则判断是否已有数据存在于结果表中，若存在则更新时间，否则则新增
+                    if (StringUtil.isEmpty(val)) {
+                        if (columnResult != null) {
+                            columnResultUp.setIsSolved(SolvedStatusEnum.NOT_SOLVED.getKey());
+                            nonnullResultUp.setIsSolved(SolvedStatusEnum.NOT_SOLVED.getKey());
+                            //加入修改集合
+                            upColumnResultList.add(columnResultUp);
+                            upNonnullResultList.add(nonnullResultUp);
+                        } else {
+                            //新增
+                            //为空加入非空校验结果表
+                            NonnullResult nonnullResultAdd = new NonnullResult();
+                            nonnullResultAdd.setHospitalId(getTableColumnInfoDTO.getHospitalId());
+                            nonnullResultAdd.setBehospitalCode(getTableColumnInfoDTO.getBehospitalCode());
+                            nonnullResultAdd.setModeId(getTableColumnInfoDTO.getModeId());
+                            nonnullResultAdd.setModeName(getTableColumnInfoDTO.getModeName());
+                            if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
+                                nonnullResultAdd.setHosptialDatatmpCode(getTableColumnInfoDTO.getRecId());
+                            }
+                            if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
+                                nonnullResultAdd.setHosptialDatatmpName(getTableColumnInfoDTO.getRecTitle());
+                            }
+                            nonnullResultAdd.setColumnId(nonnullInfo.getColumnId());
+                            nonnullResultAdd.setBehospitalDate(getTableColumnInfoDTO.getBehospitalDate());
+                            nonnullResultAdd.setTableCname(columnInfo.getTableCname());
+                            nonnullResultAdd.setHospitalDataCode(getTableColumnInfoDTO.getNumberId());
+                            nonnullResultAdd.setBehospitalDate(getTableColumnInfoDTO.getBehospitalDate());
+                            nonnullResultAdd.setTableEname(columnInfo.getTableEname());
+                            nonnullResultAdd.setColumnCname(columnInfo.getColumnCname());
+                            nonnullResultAdd.setColumnEname(columnInfo.getColumnEname());
+                            nonnullResultAdd.setTableVal(getTableColumnInfoDTO.getVal());
+                            if (principleId != null) {
+                                nonnullResultAdd.setCreator(principleId.toString());
+                            }
+                            nonnullResultAdd.setTableId(getTableColumnInfoDTO.getTableId());
+                            nonnullResultAdd.setIsSolved(SolvedStatusEnum.NOT_SOLVED.getKey());
+                            nonnullResultAdd.setSolveTime(new Date());
+                            nonnullResultAdd.setIsAudited(AuditStatusEnum.NOT_AUDIT.getKey());
+                            nonnullResultAdd.setGmtCreate(new Date());
+                            nonnullResultAdd.setGmtModified(new Date());
+                            addNonnullResultList.add(nonnullResultAdd);
+                            //加入总结果表
+                            ColumnResult columnResultAdd = addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, ColumnResultTypeEnum.NONNULL_TYPE.getKey(), principleId);
+                            addColumnResultList.add(columnResultAdd);
+                        }
 
+                    }
                 }
             }
         }

daqe-center/src/main/java/com/lantone/daqe/facade/ColumnVerifyManagementFacade.java

@@ -28,6 +28,7 @@ import com.lantone.daqe.entity.RegularMapping;
 import com.lantone.daqe.entity.RegularResult;
 import com.lantone.daqe.entity.StandardvalueInfo;
 import com.lantone.daqe.entity.StandardvalueResult;
+import com.lantone.daqe.enums.ColumnResultTypeEnum;
 import com.lantone.daqe.enums.ColumnVerifyTypeEnum;
 import com.lantone.daqe.facade.base.ColumnInfoFacade;
 import com.lantone.daqe.facade.base.ColumnResultFacade;
@@ -629,12 +630,32 @@ public class ColumnVerifyManagementFacade {
                                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                         );
                         Long mappingId = selectOneMapping.getId();
+                        Long regularId = selectOneMapping.getRegularId();
+                        //获取结果表id
+                        List<Long> ids = new ArrayList<>();
+                        List<RegularResult> regularResults = regularResultFacade.getBaseMapper().selectList(new QueryWrapper<RegularResult>()
+                                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                                .eq("regular_id", regularId));
+                        if (ListUtil.isNotEmpty(regularResults)) {
+                            regularResults.stream().forEach(regularResult -> {
+                                ids.add(regularResult.getId());
+                            });
+                        }
+                        //删除结果表数据
+                        regularResultFacade.remove(new UpdateWrapper<RegularResult>()
+                                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                                .eq("regular_id", regularId)
+                        );
                         //修改总表
                         columnVerifyFacade.remove(new UpdateWrapper<ColumnVerify>()
                                 .eq("column_id", columnId)
                                 .eq("type", ColumnVerifyTypeEnum.REGULAR_TYPE.getKey())
                                 .eq("verify_id", mappingId)
                         );
+                        //删除结果表数据
+                        if(ListUtil.isNotEmpty(ids)) {
+                            delColumnResult(ids, ColumnResultTypeEnum.REGULAR_TYPE.getKey());
+                        }
                     }
                     //未关联则不处理
                 }
@@ -738,6 +759,23 @@ public class ColumnVerifyManagementFacade {
                         }
                     }
                 } else {
+                    //获取结果表id
+                    List<Long> ids = new ArrayList<>();
+                    List<StandardvalueResult> standardvalueResultsList = standardvalueResultFacade.getBaseMapper().selectList(new QueryWrapper<StandardvalueResult>()
+                            .eq("is_deleted", IsDeleteEnum.N.getKey())
+                            .eq("column_id", columnId));
+                    if (ListUtil.isNotEmpty(standardvalueResultsList)) {
+                        standardvalueResultsList.stream().forEach(standardvalueResult -> {
+                            ids.add(standardvalueResult.getId());
+                        });
+                    }
+                    //删除结果表数据
+                    standardvalueResultFacade.remove(new UpdateWrapper<StandardvalueResult>()
+                            .eq("is_deleted", IsDeleteEnum.N.getKey())
+                            .eq("column_id", columnId));
+                    if(ListUtil.isNotEmpty(ids)) {
+                        delColumnResult(ids, ColumnResultTypeEnum.STANDARD_TYPE.getKey());
+                    }
                     //为空则存在的关联给删掉
                     standardvalueInfoFacade.remove(new UpdateWrapper<StandardvalueInfo>()
                             .eq("column_id", columnId)
@@ -752,6 +790,20 @@ public class ColumnVerifyManagementFacade {
         }
         return true;
     }
+    /**
+     * 删除结果总表数据
+     *
+     * @param ids
+     * @param type
+     * @return:
+     */
+    public Boolean delColumnResult(List<Long> ids , String type){
+       return columnResultFacade.remove(new UpdateWrapper<ColumnResult>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("type",type)
+                .in("result_id",ids)
+        );
+    }
 
     /**
      * 根据表名新增字段信息

daqe-center/src/main/java/com/lantone/daqe/facade/HisDataManagementFacade.java

@@ -79,6 +79,9 @@ public class HisDataManagementFacade {
                 .ge(dataRepariVO.getStartDate() != null && StringUtil.isBlank(dataRepariVO.getBehospitalCode()), "behospital_date", dataRepariVO.getStartDate())
                 .le(dataRepariVO.getEndDate() != null && StringUtil.isBlank(dataRepariVO.getBehospitalCode()), "behospital_date", dataRepariVO.getEndDate())
                 .eq(StringUtil.isNotBlank(dataRepariVO.getBehospitalCode()), "behospital_code", dataRepariVO.getBehospitalCode()));
+        if (ListUtil.isEmpty(hisBehospitalInfos) && StringUtil.isNotBlank(dataRepariVO.getBehospitalCode())) {
+            Asserts.fail("未查询到该患者信息");
+        }
         //通过病历获取病案首页和文书
         if (ListUtil.isEmpty(hisBehospitalInfos)) {
             return true;

report-service/src/main/resources/mapper/AppealExamineInfoMapper.xml

@@ -5,7 +5,10 @@
 
     <select id="getComplaintRecord" resultType="com.lantone.report.dto.GetComplaintRecordDTO">
         SELECT
-        a.*, b.linkman AS claimant_name,
+        a.*,
+        CASE WHEN b.linkman IS NULL
+        THEN doctor.`name`
+        ELSE b.linkman END AS claimant_name,
         c.linkman AS check_name
         FROM
         (
@@ -109,10 +112,11 @@
             <![CDATA[ AND c.example_status = #{getComplaintRecordVO.state}]]>
         </if>
         ) a
-        LEFT JOIN sys_user b ON a.claimant_id = b.id
-        LEFT JOIN sys_user c ON a.check_id = c.id
-        WHERE b.is_deleted='N'
-        AND c.is_deleted='N'
+        LEFT JOIN sys_user b ON a.claimant_id = b.id AND b.is_deleted='N'
+        LEFT JOIN sys_user c ON a.check_id = c.id AND c.is_deleted='N'
+        LEFT JOIN bas_doctor_info doctor ON doctor.doctor_id = a.claimant_id AND a.hospital_id = doctor.hospital_id AND doctor.is_deleted='N'
+        WHERE
+         1=1
         <if test="getComplaintRecordVO.name != null and getComplaintRecordVO.name != '' ">
             <![CDATA[ AND c.linkman like concat('%',#{getComplaintRecordVO.name},'%')]]>
         </if>
@@ -120,7 +124,9 @@
 
     <select id="getAppealReview" resultType="com.lantone.report.dto.GetAppealReviewDTO">
         SELECT
-        a.*, b.linkman AS claimant_name,
+        a.*, CASE WHEN b.linkman IS NULL
+        THEN doctor.`name`
+        ELSE b.linkman END AS claimant_name,
         c.linkman AS check_name
         FROM
         (
@@ -217,6 +223,7 @@
         ) a
         LEFT JOIN sys_user b ON a.claimant_id = b.id AND b.is_deleted='N'
         LEFT JOIN sys_user c ON a.check_id = c.id
+        LEFT JOIN bas_doctor_info doctor ON doctor.doctor_id = a.claimant_id AND a.hospital_id = doctor.hospital_id AND doctor.is_deleted='N'
         WHERE c.is_deleted='N'
         <if test="getAppealReviewVO.name != null and getAppealReviewVO.name != '' ">
             <![CDATA[ AND b.linkman like concat('%',#{getAppealReviewVO.name},'%')]]>

report-service/src/main/resources/mapper/AppealInfoMapper.xml

@@ -66,7 +66,9 @@
             mae.gmt_create appealExamineDate,
             mae.msg,
             mae.`value` score,
-            u.linkman claimantName,
+            CASE WHEN u.linkman IS NULL
+            THEN doctor.`name`
+            ELSE u.linkman END claimantName,
             u2.linkman checkName
         FROM
             med_appeal_info mai
@@ -75,6 +77,7 @@
         AND qce.is_deleted = "N"
         LEFT JOIN sys_user u ON mai.claimant_id = u.id
         LEFT JOIN sys_user u2 ON mai.check_id = u2.id
+        LEFT JOIN bas_doctor_info doctor ON doctor.doctor_id = mai.claimant_id AND mai.hospital_id = doctor.hospital_id AND doctor.is_deleted='N'
         WHERE
             1 = 1
         AND mai.work_flow_node_id != #{getAppealInfoVO.concelWorkFlowNode}

security-center/src/main/java/com/lantone/security/facade/UserManagementFacade.java

@@ -161,18 +161,16 @@ public class UserManagementFacade {
         }
     }
 
-    public UserDto loadUserByUsername(String username) {
+    public CommonResult<UserDto> loadUserByUsername(String username) {
         QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
         userQueryWrapper.eq("username", username);
         userQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         List<User> userList = userFacade.list(userQueryWrapper);
         if (userList.size() == 0) {
-            CommonResult.failed("用户不存在！");
-//            Asserts.fail("用户不存在！");
+            return CommonResult.failed("用户不存在！");
         }
         if (userList.size() > 1) {
-            CommonResult.failed("当前账号异常！");
-//            Asserts.fail("当前账号异常！");
+            return CommonResult.failed("当前账号异常！");
         }
 
         UserDto userDTO = new UserDto();
@@ -194,7 +192,7 @@ public class UserManagementFacade {
         BeanUtils.copyProperties(user, userDTO);
         userDTO.setUserName(user.getUsername());
         userDTO.setRoles(roleIdNames);
-        return userDTO;
+        return CommonResult.success(userDTO);
     }
 
     /**

security-center/src/main/java/com/lantone/security/web/UserManagementController.java

@@ -55,7 +55,7 @@ public class UserManagementController {
     @ApiOperation("根据用户名获取通用用户信息")
     @PostMapping(value = "/loadByUsername")
     public CommonResult<UserDto> loadUserByUsername(@RequestParam String username) {
-        return CommonResult.success(userManagementFacade.loadUserByUsername(username));
+        return userManagementFacade.loadUserByUsername(username);
     }
 
     @ApiOperation(value = "添加用户 [by:songxl]")

user-auth/src/main/java/com/lantone/userauth/service/impl/UserServiceImpl.java

@@ -1,8 +1,10 @@
 package com.lantone.userauth.service.impl;
 
 import com.lantone.common.api.CommonResult;
+import com.lantone.common.api.ResultCode;
 import com.lantone.common.constant.AuthConstant;
 import com.lantone.common.domain.UserDto;
+import com.lantone.common.exception.Asserts;
 import com.lantone.userauth.constant.MessageConstant;
 import com.lantone.userauth.domain.SecurityUser;
 import com.lantone.userauth.service.UserManagemenService;
@@ -37,6 +39,9 @@ public class UserServiceImpl implements UserDetailsService {
         UserDto userDto = null;
         if (AuthConstant.SECURITY_CENTER_CLIENT_ID.equals(clientId)) {
             CommonResult<UserDto> result = userManagemenService.loadUserByUsername(username);
+            if(ResultCode.SUCCESS.getCode()!=result.getCode()){
+                Asserts.fail(result.getMessage());
+            }
             userDto = result.getData();
         }
         if (userDto == null) {