Merge remote-tracking branch 'origin/dev' into dev

src/main/java/org/rcisoft/sys/sysuser/service/impl/SysUserServiceImpl.java

@@ -97,18 +97,27 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
                     sysUserRepositorys.updateSysUser(u);
                 }
             }
-        }
-        //添加所属园区中文
-        sysUser.setAddressLabel(sysUser.getAddressLabel());
-        //添加职位中文
-        sysUser.setPositionLabel(sysUser.getPositionLabel());
-        //添加班次中文
-        sysUser.setNltBzLabel(sysUser.getNltBzLabel());
-        //添加用户名
-        sysUser.setUsername(sysUser.getPhone());
-        //添加身份
-        sysUser.setIdentity("1");
-        sysUserRepositorys.addSysUsers(sysUser);
+            return new CyPersistModel(1);
+        } else {
+            //判断手机号在访客中是否重复
+            if (userList.size() != 0 && userList.get(0).getUserType().equals("1")) {
+                sysUserRepositorys.delSysUser(Long.valueOf(userList.get(0).getBusinessId()));
+            }
+            // 新增员工
+            if (userList.size() > 0) {
+                throw new CyServiceException(500, "手机号已存在");
+            }
+            //添加所属园区中文
+            sysUser.setAddressLabel(sysUser.getAddressLabel());
+            //添加职位中文
+            sysUser.setPositionLabel(sysUser.getPositionLabel());
+            //添加班次中文
+            sysUser.setNltBzLabel(sysUser.getNltBzLabel());
+            //添加用户名
+            sysUser.setUsername(sysUser.getPhone());
+            //添加身份
+            sysUser.setIdentity("1");
+            sysUserRepositorys.addSysUsers(sysUser);
 /*            if (!jieLinkService.pushAddUserData(sysUser)) {
                 try {
                     throw new CyServiceException(500, "添加员工失败，请稍后重试");

src/main/resources/mapper/AttendanceSyncMapper.xml

@@ -63,10 +63,10 @@
             and nlt_bz = #{entity.nltBz}
         </if>
         <if test="entity.sort == '0'.toString()">
-            order by work_hours
+            order by date_of_attendance desc, work_hours desc
         </if>
         <if test="entity.sort == '1'.toString()">
-            order by off_hours
+            order by date_of_attendance desc, off_hours desc
         </if>
         <if test="entity.sort == '2'.toString()">
             order by time_on_job + 0