|
@@ -31,8 +31,10 @@ import com.xjrsoft.common.utils.TreeUtil;
|
|
|
import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
|
import com.xjrsoft.module.base.entity.BaseClass;
|
|
|
import com.xjrsoft.module.base.entity.BaseGrade;
|
|
|
+import com.xjrsoft.module.base.entity.WhitelistManagement;
|
|
|
import com.xjrsoft.module.base.service.IBaseClassService;
|
|
|
import com.xjrsoft.module.base.service.IBaseGradeService;
|
|
|
+import com.xjrsoft.module.base.service.IWhitelistManagementService;
|
|
|
import com.xjrsoft.module.hikvision.util.DataUtil;
|
|
|
import com.xjrsoft.module.organization.dto.AddUserDto;
|
|
|
import com.xjrsoft.module.organization.dto.BindOpenidDto;
|
|
@@ -153,7 +155,7 @@ public class UserController {
|
|
|
private final HistoryService historyService;
|
|
|
|
|
|
private final IBaseStudentSchoolRollService baseStudentSchoolRollService;
|
|
|
-
|
|
|
+ private final IWhitelistManagementService whitelistManagementService;
|
|
|
|
|
|
@GetMapping(value = "/list")
|
|
|
@ApiOperation(value = "用户列表(不分页)")
|
|
@@ -744,6 +746,15 @@ public class UserController {
|
|
|
return RT.error("学生不存在!");
|
|
|
}
|
|
|
|
|
|
+ List<WhitelistManagement> managementList = whitelistManagementService.list(
|
|
|
+ new QueryWrapper<WhitelistManagement>().lambda()
|
|
|
+ .eq(WhitelistManagement::getUserId, dto.getUserId())
|
|
|
+ );
|
|
|
+ userStudentInfoVo.setWhitelistStatus(0);
|
|
|
+ if(!managementList.isEmpty()){
|
|
|
+ userStudentInfoVo.setWhitelistStatus(1);
|
|
|
+ }
|
|
|
+
|
|
|
return RT.ok(userStudentInfoVo);
|
|
|
}
|
|
|
|