bug修复

src/main/java/com/xjrsoft/module/base/controller/WhitelistManagementController.java

@@ -102,6 +102,18 @@ public class WhitelistManagementController {
         return RT.ok(updated);
     }
 
+    @PostMapping("/set-temporary")
+    @ApiOperation(value = "设置为永久")
+    @SaCheckPermission("whitelistmanagement:add")
+    public RT<Boolean> setTemporary(@Valid @RequestBody List<Long> ids){
+        List<WhitelistManagement> list = whitelistManagementService.listByIds(ids);
+        for (WhitelistManagement whitelistManagement : list) {
+            whitelistManagement.setIsTemporary(0);
+        }
+        boolean updated = whitelistManagementService.updateBatchById(list);
+        return RT.ok(updated);
+    }
+
     @PutMapping
     @ApiOperation(value = "修改白名单管理")
     @SaCheckPermission("whitelistmanagement:edit")

src/main/java/com/xjrsoft/module/organization/vo/DepartmentVo.java

@@ -45,7 +45,9 @@ public class DepartmentVo implements Serializable {
     @ApiModelProperty("备注")
     private String remark;
 
-
     @ApiModelProperty("组织类别，1：公司，0：部门")
     private Integer departmentType;
+
+    @ApiModelProperty("是否专业部(1:是 0:否)")
+    private Integer isMajor;
 }

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

@@ -124,7 +124,10 @@ public class  BaseStudentInfoController {
         whitelistInfoVo.setWhitelistStatus(0);
         if(one != null){
             whitelistInfoVo.setWhitelistStatus(1);
-            whitelistInfoVo.setEndTime(one.getEndTime());
+            if(one.getIsTemporary() == 1){
+                whitelistInfoVo.setEndTime(one.getEndTime());
+            }
+
             whitelistInfoVo.setIsTemporary(one.getIsTemporary());
         }