bug修改

src/main/java/org/rcisoft/sys/sysuser/controller/SysUserController.java

@@ -65,6 +65,17 @@ public class SysUserController extends CyPaginationController<SysUser> {
                 sysUser);
     }
 
+    @CyOpeLogAnno(title = "system-用户表管理-查询用户是否为访客", businessType = CyLogTypeEnum.QUERY)
+    @ApiOperation(value = "查询单一用户表", notes = "查询单一用户表")
+    @GetMapping("/persistIsVisitPerson")
+    public CyResult persistIsVisitPerson(SysUser sysUser) {
+        return CyResultGenUtil.builder(new CyPersistModel(1),
+                CyMessCons.MESSAGE_ALERT_SUCCESS,
+                CyMessCons.MESSAGE_ALERT_ERROR,
+                sysUserServiceImpl.persistIsVisitPerson(sysUser));
+    }
+
+
     //@PreAuthorize("@cyPerm.hasPerm('sys:user:delete')")
     @CyOpeLogAnno(title = "system-用户表管理-删除用户表", businessType = CyLogTypeEnum.DELETE)
     @ApiOperation(value = "逻辑删除用户表", notes = "逻辑删除用户表")

src/main/java/org/rcisoft/sys/sysuser/service/SysUserService.java

@@ -26,6 +26,8 @@ public interface SysUserService {
     */
     CyPersistModel persist(SysUser sysUser);
 
+    SysUser persistIsVisitPerson(SysUser sysUser);
+
     /**
     * 删除 用户表
     * @param sysUser

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

@@ -33,6 +33,7 @@ import org.rcisoft.sys.sysuser.entity.SysUserRole;
 import org.rcisoft.sys.sysuser.service.SysUserService;
 import org.rcisoft.sys.sysuser.util.CheckUtil;
 import org.rcisoft.sys.sysuser.util.CyEpExcelUtil;
+import org.rcisoft.sys.visit.dao.VisitPersonRepositorys;
 import org.rcisoft.sys.visit.dto.VisitPersonDTO;
 import org.rcisoft.sys.wbac.user.dto.ErrorDTO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,6 +65,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
     @Autowired
     private SysUserRepositorys sysUserRepositorys;
     @Autowired
+    private VisitPersonRepositorys visitPersonRepositorys;
+    @Autowired
     private SysDeptRepositorys sysDeptRepositorys;
     @Autowired
     private SysDictDataRepositorys sysDictDataRepositorys;
@@ -93,6 +96,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT)
     @Override
     public CyPersistModel persist(SysUser sysUser) {
+        // 如果传入的sysUser有id，则说明传入的用户为访客，则删除其作为访客的数据
+        if (sysUser.getBusinessId() != null){
+            visitPersonRepositorys.delSysUser(Long.valueOf(sysUser.getBusinessId()));
+        }
         // 判断是否存在用户
         List<SysUser> userList = sysUserRepositorys.querySysUsersByPhone(sysUser.getPhone());
         // 用户已存在
@@ -137,6 +144,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
         }
     }
 
+    /**
+     * 判断新增的员工是否曾经是访客
+     * **/
+    @Override
+    public SysUser persistIsVisitPerson(SysUser sysUser){
+
+        List<SysUser> visitPersonList = visitPersonRepositorys.queryVisitPersonByPhone(sysUser.getPhone());
+        if (visitPersonList.size() > 0){
+            sysUser.setBusinessId(visitPersonList.get(0).getBusinessId());
+        }
+        return sysUser;
+    }
+
     /**
      * 删除 用户表
      *

src/main/java/org/rcisoft/sys/visit/dao/VisitPersonRepositorys.java

@@ -39,6 +39,8 @@ public interface VisitPersonRepositorys extends CyBaseMapper<SysUser> {
 
     List<SysUser> querySysUsersByPhone(String phone);
 
+    List<SysUser> queryVisitPersonByPhone(String phone);
+
     List<SysUser> queryVisitUsersByPhoneAndName(String phone,String name);
     List<SysUser> querySysUsersByUserName(String username);
 

src/main/resources/mapper/VisitPersonRepositorys.xml

@@ -285,6 +285,14 @@
           and phone = #{phone}
     </select>
 
+    <select id="queryVisitPersonByPhone" resultMap="BaseResultMap">
+        select *
+        from sys_user
+        where del_flag = 0
+          and user_type = 1
+          and phone = #{phone}
+    </select>
+
     <select id="queryVisitUsersByPhoneAndName" resultMap="BaseResultMap">
         select *
         from sys_user