Merge remote-tracking branch 'origin/master'

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/SqlServerMapper.java

@@ -23,7 +23,7 @@ public interface SqlServerMapper {
     List<ZProject> getZProjectList();
 
     @DS("slave")
-    @Select("select DISTINCT a.EMPID,a.USERID,a.EMPNAME,b.EMPID AS 'USERID4A' from OM_EMPLOYEE a LEFT JOIN AC_OPERATOR b ON a.USERID = b.USERID ")
+    @Select("select DISTINCT a.EMPID,a.USERID,a.EMPNAME,a.GENDER,a.OEMAIL,a.MOBILENO,b.EMPID AS 'USERID4A' from OM_EMPLOYEE a LEFT JOIN AC_OPERATOR b ON a.USERID = b.USERID ")
     List<Map<String, Object>> getUsers();
 
     @DS("slave")

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ScheduledTasksServiceBySqlServerServiceImpl.java

@@ -100,6 +100,9 @@ public class ScheduledTasksServiceBySqlServerServiceImpl implements ScheduledTas
             String account = userMap.getOrDefault("USERID", "").toString();
             String name = userMap.getOrDefault("EMPNAME", "").toString();
             String userid4A = userMap.getOrDefault("USERID4A", "").toString();
+            String gender = userMap.getOrDefault("GENDER", "").toString();
+            String email = userMap.getOrDefault("OEMAIL", "").toString();
+            String mobile = userMap.getOrDefault("MOBILENO", "").toString();
 
             SysUser sysUser2 = sysUserList.stream().filter(sysUser -> sysUser.getId().equals(id)).findFirst().orElse(null);
 
@@ -111,6 +114,13 @@ public class ScheduledTasksServiceBySqlServerServiceImpl implements ScheduledTas
                 sysUser.setCode(account);
                 sysUser.setPassword(SecurityUtil.getSaltMd5AndSha("PIMS8284==scjy@z", id));
                 sysUser.setUserattribute(userid4A);
+                if ("f".equals(gender)) {
+                    sysUser.setGender("female");
+                } else {
+                    sysUser.setGender("male");
+                }
+                sysUser.setEmail(email);
+                sysUser.setMobile(mobile);
                 needUserInsert.add(sysUser);
             } else {
                 if (!userid4A.equals(sysUser2.getUserattribute())) {//4AID不同，更新