add. 新加根据用户id查询用户档案信息接口

sop-business/src/main/java/com/qmth/sop/business/bean/result/UserArchivesInfoResult.java

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.List;
+
 /**
  * @Description: 档案信息
  * @Author: CaoZixuan
@@ -23,6 +25,9 @@ public class UserArchivesInfoResult {
     @ApiModelProperty("手机号")
     private String mobileNumber;
 
+    @ApiModelProperty(value = "认证角色集合")
+    private List<RoleResult> roleInfoList;
+
     public Long getUserId() {
         return userId;
     }
@@ -54,4 +59,12 @@ public class UserArchivesInfoResult {
     public void setMobileNumber(String mobileNumber) {
         this.mobileNumber = mobileNumber;
     }
+
+    public List<RoleResult> getRoleInfoList() {
+        return roleInfoList;
+    }
+
+    public void setRoleInfoList(List<RoleResult> roleInfoList) {
+        this.roleInfoList = roleInfoList;
+    }
 }

sop-business/src/main/java/com/qmth/sop/business/mapper/TBUserArchivesMapper.java

@@ -78,6 +78,4 @@ public interface TBUserArchivesMapper extends BaseMapper<TBUserArchives> {
     List<UserArchivesResult> findSubTotal();
 
     List<Map<String, Object>> findTempEmp();
-
-    List<UserArchivesInfoResult> findArchivesInfoByUserId(@Param("userId") Long userId);
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBUserArchivesServiceImpl.java

@@ -648,14 +648,13 @@ public class TBUserArchivesServiceImpl extends ServiceImpl<TBUserArchivesMapper,
 
     @Override
     public UserArchivesInfoResult findArchivesInfoByUserId(Long userId) {
+        UserArchivesResult dto = this.findUserArchivesByArchivesIdORUserId(null, userId);
         UserArchivesInfoResult result = new UserArchivesInfoResult();
-        List<UserArchivesInfoResult> list = this.baseMapper.findArchivesInfoByUserId(userId);
-        if (CollectionUtils.isNotEmpty(list)) {
-            if (list.size() > 1) {
-                throw ExceptionResultEnum.ERROR.exception("用户档案信息异常");
-            }
-            result = list.get(0);
-        }
+        result.setUserId(dto.getUserId());
+        result.setMobileNumber(dto.getMobileNumber());
+        result.setSupplierName(dto.getSupplierName());
+        result.setName(dto.getName());
+        result.setRoleInfoList(dto.getRoleInfoList());
         return result;
     }
 }

sop-business/src/main/resources/mapper/TBUserArchivesMapper.xml

@@ -391,26 +391,4 @@
     <select id="findTempEmp" resultType="java.util.Map">
         SELECT * FROM temp_emp
     </select>
-    <select id="findArchivesInfoByUserId"
-            resultType="com.qmth.sop.business.bean.result.UserArchivesInfoResult">
-        SELECT
-            su.id AS userId,
-            tbua.name AS name,
-            ss.name AS supplierName,
-            su.mobile_number AS mobileNumber
-        FROM
-            t_b_user_archives tbua
-                LEFT JOIN
-            t_b_user_archives_supplier tbuas ON tbua.id = tbuas.user_archives_id
-                LEFT JOIN
-            sys_supplier ss ON tbuas.supplier_id = ss.id
-                LEFT JOIN
-            sys_user su ON tbua.mobile_number = su.mobile_number
-        <where>
-            <if test="userId != null">
-                AND su.id = #{userId}
-            </if>
-        </where>
-    </select>
-
 </mapper>