1.花名册列定制 系统字段受启用限制 2.编制冻结接口强控校验修改

src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml

@@ -149,7 +149,7 @@
                      groupid,
                      #{scopeId} as scopeId,
                      'hrm'      as tablename
-              FROM hrm_formfield) hrmallfield
+              FROM hrm_formfield where isuse = 1) hrmallfield
         WHERE FIELDHTMLTYPE != '6' and groupid IN (SELECT id FROM hrm_fieldgroup WHERE grouptype = #{scopeId})
         ORDER BY hrmallfield.groupid, hrmallfield.fieldorder
     </select>

src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java

@@ -81,7 +81,7 @@ public class FunctionOutStaffServiceImpl {
             OrganizationAssert.isFalse(staffPO.getFreezeNum() == 0, SystemEnv.getHtmlLabelName(547949,user.getLanguage()));
         }
 
-        List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
+        List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum(),staffPO.getPermanentNum());
         //1.增加冻结数 （num为负数时为减少冻结数）
         Integer sum = numberF.stream()
                 .mapToInt(Integer::intValue)