Sfoglia il codice sorgente

根据需求修改c端用户信息查询接口,根据获取的机构编码进行查询

zhangxin 2 settimane fa
parent
commit
c5dca769f4

+ 13 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/CUserInfoController.java

@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.system.app.dto.FindPageCUserInfoRequestDTO;
 import org.jeecg.modules.system.app.dto.FindPageCUserInfoResponseDTO;
 import org.jeecg.modules.system.service.ISysUserService;
@@ -38,6 +41,16 @@ public class CUserInfoController {
                                                                      @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                                      @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                                      HttpServletRequest req) {
+        Subject subject = SecurityUtils.getSubject();
+        LoginUser loginUser =null;
+        if (subject.isAuthenticated()) {
+            // 获取当前登录的用户信息
+            loginUser= (LoginUser) subject.getPrincipal();
+        }
+        if (loginUser==null){
+            return Result.error("当前未登录,请先登录;或者未获取到用户信息,请联系管理员");
+        }
+        findPageCUserInfoRequestDTO.setOrgCode(loginUser.getOrgCode());
         return Result.OK(iSysUserService.findByCUserInfo(pageNo,pageSize,findPageCUserInfoRequestDTO));
     }
 }

+ 3 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/FindPageCUserInfoRequestDTO.java

@@ -25,5 +25,8 @@ public class FindPageCUserInfoRequestDTO {
     @Schema(description = "实名状态 0-未实名 ;1-已实名")
     private Integer realNameStatus;
 
+    @Schema(description = "部门编码")
+    private String orgCode;
+
 
 }

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java

@@ -234,6 +234,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	 **/
 	List<String> getUserIdListByRoleId(@Param("roleCode") String roleCode);
 
-    IPage<FindPageCUserInfoResponseDTO> findPage(Page<FindPageCUserInfoResponseDTO> page, FindPageCUserInfoRequestDTO findPageCUserInfoRequestDTO);
+    IPage<FindPageCUserInfoResponseDTO> findPage(@Param("page")Page<FindPageCUserInfoResponseDTO> page, @Param("findPageCUserInfoRequestDTO") FindPageCUserInfoRequestDTO findPageCUserInfoRequestDTO);
 
 }

+ 10 - 4
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -306,11 +306,17 @@
     <select id="findPage" resultType="org.jeecg.modules.system.app.dto.FindPageCUserInfoResponseDTO">
 		select * from (
 		select su.id,su.username,su.avatar,su.phone,su.create_time,fm.real_name_status from sys_user su
-		left join  nm_family_members fm on su.id=fm.userId
-		where su.del_flag=0 and su.org_code='A03' and fm.del_flag=0 and fm.user_type=0 ) t
+		left join  nm_family_members fm on su.id=fm.user_id
+		where su.del_flag=0 and su.org_code like CONCAT('',#{findPageCUserInfoRequestDTO.orgCode},'%')
+		<if test="findPageCUserInfoRequestDTO.username!=null  and findPageCUserInfoRequestDTO.username!=''">
+		  and su.username like CONCAT('%',#{findPageCUserInfoRequestDTO.username},'%')
+		</if>
+		<if test="findPageCUserInfoRequestDTO.realNameStatus!=null">
+			and fm.real_name_status=#{findPageCUserInfoRequestDTO.realNameStatus}
+		</if>
+		and fm.del_flag=0 and fm.user_type=0 ) t
 		left join
 		(select user_id, count(1) from nm_family_members group by  user_id ) t1 on  t.id=t1.user_id
 		order by  t.create_time desc
-
 	</select>
-</mapper>
+</mapper>