Merge remote-tracking branch 'origin/master'

mailbox-lan/src/main/java/com/biutag/lan/service/FavoriteService.java

@@ -46,7 +46,7 @@ public class FavoriteService extends ServiceImpl<FavoriteMapper, Favorite> {
                     queryWrapper.like("f.contactIdCard", mailQuery.getContactFieldValue());
                     break;
                 case "phone":
-                    queryWrapper.like("f.contactPhone", mailQuery.getContactFieldValue());
+                    queryWrapper.like("f.contact_phone", mailQuery.getContactFieldValue());
                     break;
             }
         }

mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java

@@ -273,8 +273,7 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
                 case "idCard":
                     queryWrapper.like("w.contactIdCard", todoQuery.getContactFieldValue());
                     break;
-                case "phone":
-                    queryWrapper.like("w.contactPhone", todoQuery.getContactFieldValue());
+                case "phone": queryWrapper.like("w.contact_phone", todoQuery.getContactFieldValue());
                     break;
             }
         }

mailbox-lan/src/main/java/com/biutag/lan/service/impl/PoliceUserServiceImpl.java

@@ -85,7 +85,8 @@ public class PoliceUserServiceImpl implements IPoliceUserService {
                 .like(StrUtil.isNotBlank(searchValidate.getIdCode()), "u.id_code", searchValidate.getIdCode())
                 .eq(StrUtil.isNotBlank(searchValidate.getPost()), "u.post_ids", searchValidate.getPost())
                 .eq(Objects.nonNull(searchValidate.getRole()), "u.role_ids", searchValidate.getRole())
-                .eq(StrUtil.isNotBlank(searchValidate.getDeptId()), "u.dept_ids", searchValidate.getDeptId());
+                .eq(StrUtil.isNotBlank(searchValidate.getDeptId()), "u.dept_ids", searchValidate.getDeptId())
+                .eq("u.is_delete",0);
         Integer roleId = AdminThreadLocal.getRoleId();
         Integer deptId = AdminThreadLocal.getDeptId();
         if (RoleEnum.SECOND_DEPT_CLASSES.getRoleId().equals(roleId)) {
@@ -257,7 +258,8 @@ public class PoliceUserServiceImpl implements IPoliceUserService {
         DeptVo deptVo = deptService.detail(createValidate.getDeptIds());
         model.setDeptIds(createValidate.getDeptIds().toString());
         model.setDeptName(deptVo.getName());
-
+        //数据部门
+        model.setDataDeptId(createValidate.getDeptIds());
         this.batchSaveDepartByEmpNo(createValidate.getEmpNo(), Collections.singletonList(createValidate.getDeptIds()));
         model.setPostIds(createValidate.getPostIds().toString());
         PostVo post = iPostService.detail(createValidate.getPostIds());