Browse Source

10.28,ok1

Crazy 8 months ago
parent
commit
afce9b2daa

+ 4 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java

@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
 import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -94,6 +95,9 @@ public class UserRespVO{
     @Schema(description = "用户类型")
     private String userType;
 
+    @Schema(description = "用户照片是否存在")
+    private Long photoIsExist;
+
 
 
 }

+ 4 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java

@@ -135,6 +135,10 @@ public class AdminUserDO extends TenantBaseDO {
     private String supervisorMobile;
 
     private String photoUrl;
+
+    //0已导入,1未导入
+    @TableField(exist = false)
+    private Long photoIsExist;
     
 
 

+ 31 - 16
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java

@@ -64,18 +64,24 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
     }
 
         // lsq  查所有学生
-    default PageResult<AdminUserDO> selectPage1(UserPageReqVO reqVO, Collection<Long> deptIds) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
-                .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
-                .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
-                .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
-                .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
-                .inIfPresent(AdminUserDO::getDeptId, deptIds)
-                // 添加子查询条件,查找有教师权限的人
-                .inSql(AdminUserDO::getId,
-                        "SELECT id FROM system_users WHERE user_type IN (1,2)")
-                .orderByDesc(AdminUserDO::getId));
-    }
+        default PageResult<AdminUserDO> selectPage1(UserPageReqVO reqVO, Collection<Long> deptIds) {
+            // 查询用户数据
+            PageResult<AdminUserDO> result = selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
+                    .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
+                    .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
+                    .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
+                    .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
+                    .inIfPresent(AdminUserDO::getDeptId, deptIds)
+                    .inSql(AdminUserDO::getId, "SELECT id FROM system_users WHERE user_type IN (1,2)")
+                    .orderByDesc(AdminUserDO::getId));
+
+            // 遍历结果集,设置 photoIsExist
+            for (AdminUserDO user : result.getList()) {
+                user.setPhotoIsExist(Long.valueOf(user.getPhotoUrl() != null && !user.getPhotoUrl().isEmpty() ? 1 : 0));
+            }
+
+            return result;
+        }
 
     // lsq  查工作间下的老师 3老师
     default PageResult<AdminUserDO> selectDeptTeacherPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
@@ -97,20 +103,29 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
 
     // lsq  查工作间下的学生 1在校生,2毕业生
     default PageResult<AdminUserDO> selectDeptStudentPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
-        Long loginID = SecurityFrameworkUtils.getLoginUserId(); //
+        Long loginID = SecurityFrameworkUtils.getLoginUserId();
         System.out.println(loginID);
-        return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
+
+        // 查询用户数据
+        PageResult<AdminUserDO> result = selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
                 .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
                 .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
                 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(AdminUserDO::getDeptId, deptIds)
-                .inSql(AdminUserDO::getId,
-                        "SELECT id FROM system_users WHERE user_type IN (1,2)")
+                .inSql(AdminUserDO::getId, "SELECT id FROM system_users WHERE user_type IN (1,2)")
                 .inSql(AdminUserDO::getDeptId, String.format("SELECT dept_id FROM system_users WHERE id = %d", loginID))
                 .orderByDesc(AdminUserDO::getId));
+
+        // 遍历结果集,设置 photoIsExist
+        for (AdminUserDO user : result.getList()) {
+            user.setPhotoIsExist(Long.valueOf(user.getPhotoUrl() != null && !user.getPhotoUrl().isEmpty() ? 1 : 0));
+        }
+
+        return result;
     }
 
+
     // lsq  查所有毕业学生
     default PageResult<AdminUserDO> selectGraduateStudentPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
         return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()