bug修复

src/main/java/com/xjrsoft/module/activity/controller/ActivityInfoController.java

@@ -155,10 +155,10 @@ public class ActivityInfoController {
             Set<ActivityEnrollPageVo> studentSet = enrollList.stream().filter(x -> x.getStudentId() != null).collect(Collectors.toSet());
             infoVo.setStudentCount(studentSet.size());
 
-            Set<ActivityEnrollPageVo> suretSet = enrollList.stream().filter(x -> (x.getStatus() == 1 || x.getStatus() == 2)).collect(Collectors.toSet());
+            Set<ActivityEnrollPageVo> suretSet = enrollList.stream().filter(x -> (x.getStatus() == 2)).collect(Collectors.toSet());
             infoVo.setSureCount(suretSet.size());
 
-            Set<ActivityEnrollPageVo> notSuretSet = enrollList.stream().filter(x -> x.getStatus() == 0).collect(Collectors.toSet());
+            Set<ActivityEnrollPageVo> notSuretSet = enrollList.stream().filter(x -> x.getStatus() == 1).collect(Collectors.toSet());
             infoVo.setNotSureCount(notSuretSet.size());
         }else if(category == 3){
             String tableName = "club_activities";

src/main/java/com/xjrsoft/module/student/controller/CadreDeptController.java

@@ -118,8 +118,9 @@ public class CadreDeptController {
         //校验code唯一性
         if(ObjectUtil.isNotNull(dto.getCode())){
             CadreDept cadreDept = cadreDeptService.getOne(Wrappers.<CadreDept>lambdaQuery()
+                            .ne(CadreDept::getId, dto.getId())
                     .eq(CadreDept::getCode,dto.getCode()));
-            if(ObjectUtil.isNotNull(cadreDept) && cadreDept.getId() != (dto.getId())){
+            if(ObjectUtil.isNotNull(cadreDept)){
                 throw new MyException("干部部门编号不唯一");
             }
         }

src/main/java/com/xjrsoft/module/system/service/impl/LoginServiceImpl.java

@@ -9,6 +9,7 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -22,6 +23,8 @@ import com.xjrsoft.common.utils.RedisUtil;
 import com.xjrsoft.common.utils.WeChatUtil;
 import com.xjrsoft.config.CommonPropertiesConfig;
 import com.xjrsoft.config.LicenseConfig;
+import com.xjrsoft.module.base.entity.WhitelistManagement;
+import com.xjrsoft.module.base.service.IWhitelistManagementService;
 import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.organization.entity.Post;
 import com.xjrsoft.module.organization.entity.User;
@@ -85,6 +88,8 @@ public class LoginServiceImpl implements ILoginService {
 
     private final CommonPropertiesConfig propertiesConfig;
 
+    private final IWhitelistManagementService whitelistManagementService;
+
     @Override
     public LoginVo login(LoginDto dto) throws Exception {
         if (licenseConfig.getEnabled()) {
@@ -147,6 +152,14 @@ public class LoginServiceImpl implements ILoginService {
         }
         LoginVo loginVo = getLoginInfo(loginUser, "WX-MP");
         result.setToken(loginVo.getToken());
+        result.setWhitelistStatus(0);
+        List<WhitelistManagement> managementList = whitelistManagementService.list(
+                new QueryWrapper<WhitelistManagement>().lambda()
+                        .eq(WhitelistManagement::getUserId, loginUser.getId())
+        );
+        if(!managementList.isEmpty()){
+            result.setWhitelistStatus(1);
+        }
         result.setUserType(loginVo.getUserType());
 
         return result;

src/main/java/com/xjrsoft/module/system/vo/LoginByCodeVo.java

@@ -10,4 +10,7 @@ public class LoginByCodeVo extends LoginVo {
     private String openId;
 
     private  String unionId;
+
+
+    private Integer whitelistStatus;
 }