feat: 企业规章制度保存/查询接口2

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysDeptController.java

@@ -460,7 +460,12 @@ public class SysDeptController {
 		List<WmDeptRegulations> list = wmDeptRegulationsService.list(Wrappers.<WmDeptRegulations>lambdaQuery()
 				.eq(WmDeptRegulations::getDeptId, deptId)
 				.eq(WmDeptRegulations::getDelFlag, DelEnum.NOT_DEL.val()));
-		list.sort(Comparator.comparing(WmDeptRegulations::getSort));
+		list.sort((o1, o2) -> {
+			if (o1.getSort() > 0 && o2.getSort() > 0) {
+				return o1.getSort() - o2.getSort();
+			}
+			return o1.getId() - o2.getId();
+		});
 
 		return R.ok(list);
 	}
@@ -485,7 +490,6 @@ public class SysDeptController {
 		// 后保存
 		list.forEach(regulations -> {
 			regulations.setDeptId(deptId);
-			regulations.setEnableFlag(EnableEnum.ENABLE.val());
 			regulations.setDelFlag(DelEnum.NOT_DEL.val());
 		});
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmDeptRegulations.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -31,11 +33,13 @@ public class WmDeptRegulations implements Serializable {
     /**
      * 文件名称(见字典值dept_regulations_filename)
      */
+    @NotBlank(message = "文件名称必填")
     private String fileName;
 
     /**
      * 文件地址
      */
+    @NotEmpty(message = "文件地址必填")
     private String[] fileUrl;
 
     /**
@@ -51,6 +55,7 @@ public class WmDeptRegulations implements Serializable {
     /**
      * 是否禁用:0(启用)，1(禁用)
      */
+    @NotBlank(message = "是否禁用必填")
     private String enableFlag;
 
     /**