新增字段

client_h5/src/pages/resign/index.vue

@@ -53,6 +53,13 @@
               placeholder="离职生效日期"
               readonly
           />
+          <van-field
+              v-model="formData.lzygszdText"
+              name="员工所在地"
+              label="员工所在地"
+              placeholder="员工所在地"
+              readonly
+          />
           <van-field
               v-model="formData.lzyyc"
               name="离职原因"
@@ -138,6 +145,7 @@ const initFormData = async () => {
   formData.value = result.data
 
   formData.value.drzwText = getDictLabel(DICT_TYPE.POST_TYPE, formData.value.drzw);
+  formData.value.lzygszdText = getDictLabel(DICT_TYPE.POST_TYPE, formData.value.lzygszd);
 
   formData.value.rgssjc = formatDate(formData.value.rgssj);
   formData.value.htdqsc = formatDate(formData.value.htdqs);

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/staff/RecordsServiceImpl.java

@@ -145,7 +145,14 @@ public class RecordsServiceImpl implements RecordsService {
         //学校信息
         List<SchoolDetailDO> schoolList = schoolDetailDOMapper.selectList(new LambdaQueryWrapperX<SchoolDetailDO>().eq(SchoolDetailDO::getUserId, userId));
         if (CollectionUtil.isNotEmpty(schoolList)) {
-            vo.setSchoolList(schoolList);
+            List<SchoolDetailDO> schools = schoolList.stream().sorted(
+                    (o1, o2) -> {
+                        int b1 = Integer.parseInt(o1.getXl());
+                        int b2 = Integer.parseInt(o2.getXl());
+                        return Integer.compare(b1, b2);
+                    }
+            ).collect(Collectors.toList());
+            vo.setSchoolList(schools);
         }
 
         //工作经历