福利

src/main/java/io/v/nutz/MainLauncher.java

@@ -95,16 +95,6 @@ public class MainLauncher {
         init_task();
         init_proposal_undertake();
         ioc.get(Globals.class);
-
-        try {
-            FTPClient ftpClient = new FTPClient();
-            ftpClient.connect(conf.get(PROP_SERVER_HOST, ""), conf.getInt(PROP_SERVER_PORT, 21));
-            ftpClient.login(conf.get(PROP_SERVER_USERNAME, ""), conf.get(PROP_SERVER_PASSWORD, ""));
-            ftpClient.enterLocalPassiveMode();
-            System.out.println("***************************=" + ftpClient.getReplyCode());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
     }
 
     /**

src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java

@@ -252,7 +252,7 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
             // 人员状态及在职状态更新
             userPatUpService.renewUserState();
             // 修改不在人事库的人员，删除角色
-            userPatUpService.deleteNotInSourceUser(true);
+//            userPatUpService.deleteNotInSourceUser(true);
             //清除缓存
 //            sysUserService.clearCache();
 //            sysRoleService.clearCache();

src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java

@@ -456,15 +456,15 @@ public class WelfareListController {
                 if (StrUtil.isNotBlank(courierNumberExcelMode.getOneCourierNumber())) {
                     courierNumberList.add(courierNumberExcelMode.getOneCourierNumber());
                 }
-                if (StrUtil.isNotBlank(courierNumberExcelMode.getTwoCourierNumber())) {
-                    courierNumberList.add(courierNumberExcelMode.getTwoCourierNumber());
-                }
-                if (StrUtil.isNotBlank(courierNumberExcelMode.getThreeCourierNumber())) {
-                    courierNumberList.add(courierNumberExcelMode.getThreeCourierNumber());
-                }
-                if (StrUtil.isNotBlank(courierNumberExcelMode.getFourCourierNumber())) {
-                    courierNumberList.add(courierNumberExcelMode.getFourCourierNumber());
-                }
+//                if (StrUtil.isNotBlank(courierNumberExcelMode.getTwoCourierNumber())) {
+//                    courierNumberList.add(courierNumberExcelMode.getTwoCourierNumber());
+//                }
+//                if (StrUtil.isNotBlank(courierNumberExcelMode.getThreeCourierNumber())) {
+//                    courierNumberList.add(courierNumberExcelMode.getThreeCourierNumber());
+//                }
+//                if (StrUtil.isNotBlank(courierNumberExcelMode.getFourCourierNumber())) {
+//                    courierNumberList.add(courierNumberExcelMode.getFourCourierNumber());
+//                }
 
                 for (String number : courierNumberList) {
                     WelfareCourierNumber courierNumber = new WelfareCourierNumber();

src/main/java/io/v/nutz/zhgh/welfare/mode/CourierNumberExcelMode.java

@@ -12,7 +12,7 @@ public class CourierNumberExcelMode {
     @Excel(name = "姓名", width = 20)
     private String userName;
 
-    @Excel(name = "快递单号1", width = 30)
+    @Excel(name = "快递单号", width = 30)
     private String oneCourierNumber;
 
     @Excel(name = "快递单号2", width = 30)