部门调整

.idea/workspace.xml

@@ -2,8 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="981dbcd1-a700-4015-8567-2ccff8e76f0a" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/request/insertSmartUserRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/insertSmartUserRequest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -22,8 +25,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1442">
-              <caret line="359" selection-start-line="359" selection-end-line="359" />
+            <state relative-caret-position="552">
+              <caret line="151" column="101" selection-start-line="151" selection-start-column="101" selection-end-line="151" selection-end-column="101" />
             </state>
           </provider>
         </entry>
@@ -31,8 +34,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2556">
-              <caret line="287" column="113" selection-start-line="287" selection-start-column="113" selection-end-line="287" selection-end-column="113" />
+            <state relative-caret-position="292">
+              <caret line="991" column="72" selection-start-line="991" selection-start-column="72" selection-end-line="991" selection-end-column="72" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -41,6 +44,24 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertSmartUserRequest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="414">
+              <caret line="23" column="7" selection-start-line="23" selection-start-column="7" selection-end-line="23" selection-end-column="7" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="77">
+              <caret line="114" column="40" selection-start-line="114" selection-start-column="17" selection-end-line="114" selection-end-column="40" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartTimeGroupServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="269">
@@ -71,12 +92,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>加</find>
-      <find>LocalDate</find>
-      <find>8月31日</find>
-      <find>smartGradeService</find>
-      <find>user</find>
-      <find>userhead</find>
       <find>@Tr</find>
       <find>家长关系</find>
       <find>批量导入</find>
@@ -94,13 +109,19 @@
       <find>导出</find>
       <find>queryTimeGroupByName</find>
       <find>queryTimeGroups</find>
-      <find>导入</find>
       <find>希沃新增</find>
       <find>address</find>
-      <find>readXlsx</find>
-      <find>希沃新增编辑学生家长信息</find>
       <find>orderBy</find>
+      <find>希沃新增编辑学生家长信息</find>
+      <find>downloadUserExcel</find>
       <find>queryDepartmentTree</find>
+      <find>insertSmartUser</find>
+      <find>downloadUpdateUserExcel</find>
+      <find>系统中yi</find>
+      <find>系统中</find>
+      <find>readXlsx</find>
+      <find>百胜</find>
+      <find>导入</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -128,6 +149,8 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartTimeGroupService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartAuthorGroupControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAuthorGroupController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/insertSmartUserRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
       </list>
@@ -161,9 +184,9 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
-    <option name="width" value="974" />
+    <option name="width" value="958" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectView">
@@ -355,12 +378,12 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1712903307839</updated>
-      <workItem from="1712903309092" duration="41586000" />
+      <workItem from="1712903309092" duration="48791000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="41586000" />
+    <option name="totallyTimeSpent" value="48791000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
@@ -373,7 +396,7 @@
       <window_info id="Favorites" side_tool="true" />
       <window_info id="Designer" />
       <window_info id="Web" side_tool="true" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.0858209" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.2707889" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Spring" weight="0.32932165" />
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
@@ -387,12 +410,12 @@
       <window_info anchor="bottom" id="JRebel Console" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32932165" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.44967178" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.20568928" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.44861877" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4287293" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="Maven" weight="0.9671773" />
+      <window_info anchor="right" id="Maven" weight="0.9343545" />
       <window_info anchor="right" id="Palette" />
       <window_info anchor="right" id="Capture Analysis" />
       <window_info anchor="right" id="Database" />
@@ -437,40 +460,50 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1053</line>
+          <line>1087</line>
           <properties />
           <option name="timeStamp" value="14" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>2765</line>
+          <line>2799</line>
           <properties />
           <option name="timeStamp" value="29" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>2857</line>
+          <line>2891</line>
           <properties />
           <option name="timeStamp" value="31" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
+          <line>158</line>
+          <properties />
+          <option name="timeStamp" value="49" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
+          <line>206</line>
+          <properties />
+          <option name="timeStamp" value="50" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
+          <line>174</line>
+          <properties />
+          <option name="timeStamp" value="52" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
+          <line>345</line>
+          <properties />
+          <option name="timeStamp" value="57" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsControlVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsClassVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsClassNoVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="253">
@@ -740,13 +773,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="98" column="27" selection-start-line="98" selection-start-column="17" selection-end-line="98" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.3.1/spring-core-5.3.1-sources.jar!/org/springframework/cglib/proxy/MethodProxy.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="177">
@@ -803,17 +829,38 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="77">
+          <caret line="114" column="40" selection-start-line="114" selection-start-column="17" selection-end-line="114" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertSmartUserRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="414">
+          <caret line="23" column="7" selection-start-line="23" selection-start-column="7" selection-end-line="23" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertDepartmentRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="299">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1442">
-          <caret line="359" selection-start-line="359" selection-end-line="359" />
+        <state relative-caret-position="552">
+          <caret line="151" column="101" selection-start-line="151" selection-start-column="101" selection-end-line="151" selection-end-column="101" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2556">
-          <caret line="287" column="113" selection-start-line="287" selection-start-column="113" selection-end-line="287" selection-end-column="113" />
+        <state relative-caret-position="292">
+          <caret line="991" column="72" selection-start-line="991" selection-start-column="72" selection-end-line="991" selection-end-column="72" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>

src/main/java/com/template/api/SmartUserControllerAPI.java

@@ -107,6 +107,14 @@ public interface SmartUserControllerAPI {
     CommonResult downloadUserExcel();
 
     /**
+     * 导出更新人员模板
+     * @return
+     */
+    @GetMapping(value = "/downloadUpdateUserExcel")
+    @ApiOperation(value = "导出更新人员Excel模板", notes = "导出更新人员Excel模板", httpMethod = "GET")
+    CommonResult downloadUpdateUserExcel();
+
+    /**
      * 根据用户ID查询学生
      * @return
      */

src/main/java/com/template/controller/SmartDepartmentController.java

@@ -78,11 +78,10 @@ public class SmartDepartmentController implements SmartDepartmentControllerAPI {
             return CommonResult.fail(st);
         }
 
-        //新增的时候判断是否存在重复部门名称数据
-        int exist = smartDepartmentService.existDataByName(smartDepartment.getName());
-        if (exist > 0) {
-
-            return CommonResult.fail(smartDepartment.getName() + "部门名称数据已存在，请勿重复添加！");
+        //新增的时候判断同级部门是否存在重复部门名称数据
+        SmartDepartment exist = smartDepartmentService.getSmartByName(smartDepartment.getName());
+        if (exist != null && exist.getParentId().equals(smartDepartment.getParentId())) {
+            return CommonResult.fail("同级部门中，"+smartDepartment.getName() + "部门名称数据已存在，请勿重复添加！");
         }
 
         SmartDepartment sd = new SmartDepartment();
@@ -150,7 +149,7 @@ public class SmartDepartmentController implements SmartDepartmentControllerAPI {
         }
 
         SmartDepartment exist = smartDepartmentService.getSmartByName(udr.getName());
-        if (exist != null && !exist.getId().equals(udr.getId())) {
+        if (exist != null && !exist.getId().equals(udr.getId()) && exist.getParentId().equals(oldData.getParentId())) {
             return CommonResult.fail(udr.getName() + "部门名称数据已存在，请勿重复添加！");
         }
 
@@ -168,13 +167,13 @@ public class SmartDepartmentController implements SmartDepartmentControllerAPI {
 
         JSONObject jsonobject = new JSONObject();
         jsonobject.put("appid", appId);
-        String str = "{\"department_no\":\"" + oldData.getBsDepartmentNo() + "\"department_name\":\"" + udr.getName() + "\"}";
+        String str = "{\"department_no\":\"" + oldData.getBsDepartmentNo() + "\",\"department_name\":\"" + udr.getName() + "\"}";
         String aesStr = URLEncoder.encode(AesTestOne.encrypt(str, controlConfig.getAppSecret()), "UTF-8");
         jsonobject.put("data", aesStr);
         jsonobject.put("schoolno", schoolno);
         jsonobject.put("timestamp", timestamp);
 
-        String md5Str = "appid=" + appId + "&data={\"department_no\":\"" + oldData.getBsDepartmentNo() + "\"department_name\":\"" + udr.getName() + "\"}" + "&schoolno=" + schoolno + "&timestamp=" + timestamp + "&key=" + appSecret;
+        String md5Str = "appid=" + appId + "&data={\"department_no\":\"" + oldData.getBsDepartmentNo() + "\",\"department_name\":\"" + udr.getName() + "\"}" + "&schoolno=" + schoolno + "&timestamp=" + timestamp + "&key=" + appSecret;
         String sign = CommonUtil.MD5(md5Str);
         //sign签名
         jsonobject.put("sign", sign);

src/main/java/com/template/controller/SmartUserController.java

@@ -197,6 +197,13 @@ public class SmartUserController implements SmartUserControllerAPI {
 
         //判断是否存在重复数据
         List<String> cardNos = studentDatas.stream().map(SmartUser::getCardNo).collect(Collectors.toList());
+        if(cardNos == null){
+            return CommonResult.fail("文档内容为空，导入失败");
+        }
+
+        if(cardNos.size() <= 0){
+            return CommonResult.fail("文档内容为空，导入失败");
+        }
         List<SmartUser> existUsers = smartUserService.querySmartUserByCardNos(cardNos);
         if (existUsers != null && existUsers.size() > 0) {
             String names = StringUtils.join(existUsers.stream().map(SmartUser::getName).collect(Collectors.toList()), ",");
@@ -683,13 +690,23 @@ public class SmartUserController implements SmartUserControllerAPI {
                         user.setIsCancel(eLogOff.Unlogout.getValue());
 
                         result.add(user);
+                        //部门是否为空判断
+                        String familyDepartment = dataFormatter.formatCellValue(row.getCell(1)).replace("年级", "") + "家长";
+
+                        Integer familyDepartmentId = null;
+                        Optional<SmartDepartment> familyDepartModel = departments.stream().filter(e -> e.getName().equals(familyDepartment)).findFirst();
+                        if (familyDepartModel != null && familyDepartModel.isPresent()) {
+                            familyDepartmentId = familyDepartModel.get().getId();
+                        } else {
+                            familyDepartmentId = 16;
+                        }
 
                         //region 家属
                         String family = dataFormatter.formatCellValue(row.getCell(11));//家属
                         if (!ObjectUtils.isEmpty(family)) {
                             SmartUser familyOne = new SmartUser();
                             familyOne.setName(family);
-                            familyOne.setDepartmentId(1);
+                            familyOne.setDepartmentId(familyDepartmentId);
                             familyOne.setPhone(phone);
                             familyOne.setIdentityId(eIdentityStatu.Parent.getValue());
                             familyOne.setSexId(eSexStatu.Man.getValue());
@@ -704,7 +721,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                         if (!ObjectUtils.isEmpty(familyNameTwo)) {
                             SmartUser familyTwo = new SmartUser();
                             familyTwo.setName(familyNameTwo);
-                            familyTwo.setDepartmentId(1);
+                            familyTwo.setDepartmentId(familyDepartmentId);
                             String phoneTwo = dataFormatter.formatCellValue(row.getCell(13));//联系电话2
                             familyTwo.setPhone(phoneTwo == null ? "" : phoneTwo);
                             familyTwo.setIdentityId(eIdentityStatu.Parent.getValue());
@@ -716,6 +733,14 @@ public class SmartUserController implements SmartUserControllerAPI {
                             result.add(familyTwo);
                         }
                         //endregion
+
+                        //希沃不允许一个学生家长的两个手机号重复 所以做一个重复性判断
+                        if(!ObjectUtils.isEmpty(phone) && !ObjectUtils.isEmpty(dataFormatter.formatCellValue(row.getCell(13)))){
+                            if(phone.equals(dataFormatter.formatCellValue(row.getCell(13)))){
+                                return CommonResult.fail(name + "的学生家长手机号不可重复");
+                            }
+                        }
+                        //endregion
                     }
                 }
             }
@@ -943,12 +968,23 @@ public class SmartUserController implements SmartUserControllerAPI {
 
                         result.add(user);
 
+                        //部门是否为空判断
+                        String familyDepartment = dataFormatter.formatCellValue(row.getCell(1)).replace("年级", "") + "家长";
+
+                        Integer familyDepartmentId = null;
+                        Optional<SmartDepartment> familyDepartModel = departments.stream().filter(e -> e.getName().equals(familyDepartment)).findFirst();
+                        if (familyDepartModel != null && familyDepartModel.isPresent()) {
+                            familyDepartmentId = familyDepartModel.get().getId();
+                        } else {
+                            familyDepartmentId = 16;
+                        }
+
                         //region 家属
                         String family = dataFormatter.formatCellValue(row.getCell(11));//家属
                         if (!ObjectUtils.isEmpty(family)) {
                             SmartUser familyOne = new SmartUser();
                             familyOne.setName(family);
-                            familyOne.setDepartmentId(1);
+                            familyOne.setDepartmentId(familyDepartmentId);
                             familyOne.setPhone(phone);
                             familyOne.setIdentityId(eIdentityStatu.Parent.getValue());
                             familyOne.setSexId(eSexStatu.Man.getValue());
@@ -963,7 +999,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                         if (!ObjectUtils.isEmpty(familyNameTwo)) {
                             SmartUser familyTwo = new SmartUser();
                             familyTwo.setName(familyNameTwo);
-                            familyTwo.setDepartmentId(1);
+                            familyTwo.setDepartmentId(familyDepartmentId);
                             String phoneTwo = dataFormatter.formatCellValue(row.getCell(13));//联系电话2
                             familyTwo.setPhone(phoneTwo == null ? "" : phoneTwo);
                             familyTwo.setIdentityId(eIdentityStatu.Parent.getValue());
@@ -975,6 +1011,14 @@ public class SmartUserController implements SmartUserControllerAPI {
                             result.add(familyTwo);
                         }
                         //endregion
+
+                        //希沃不允许一个学生家长的两个手机号重复 所以做一个重复性判断
+                        if(!ObjectUtils.isEmpty(phone) && !ObjectUtils.isEmpty(dataFormatter.formatCellValue(row.getCell(13)))){
+                            if(phone.equals(dataFormatter.formatCellValue(row.getCell(13)))){
+                                return CommonResult.fail(name + "的学生家长手机号不可重复");
+                            }
+                        }
+                        //endregion
                     }
                 }
             }
@@ -3006,6 +3050,13 @@ public class SmartUserController implements SmartUserControllerAPI {
         return CommonResult.ok("200", "操作成功", "https://wanzai-1306339220.cos.ap-shanghai.myqcloud.com/excelModel/人员信息表.xlsx");
     }
 
+
+    @Override
+    @DESRespondSecret(validated = true)
+    public CommonResult downloadUpdateUserExcel() {
+        return CommonResult.ok("200", "操作成功", "https://wanzai-1306339220.cos.ap-shanghai.myqcloud.com/excelModel/更新信息表.xlsx");
+    }
+
     @Override
     @DESRespondSecret(validated = true)
     public CommonResult queryStudents(int userId) {

src/main/java/com/template/model/request/insertSmartUserRequest.java

@@ -22,7 +22,6 @@ public class insertSmartUserRequest {
     /**
      * 时间组ID
      */
-    @NotNull(message = "时间组ID不能为空")
     private Integer timeGroupId;
 
     /**