修改数据

src/main/java/com/ydtech/modules/admin/model/dto/SysUserTeamDto.java

@@ -3,13 +3,17 @@ package com.ydtech.modules.admin.model.dto;
 import com.ydtech.modules.admin.model.SysUser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
 
 @ApiModel(value = "团队认证返回实体")
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class SysUserTeamDto implements Serializable {
 
     private static final long serialVersionUID = 8942812169841900706L;

src/main/java/com/ydtech/modules/admin/model/vo/AppCustomerManagementQueryVo.java

@@ -21,14 +21,8 @@ public class AppCustomerManagementQueryVo implements Serializable {
 
     private static final long serialVersionUID = 7309342260901481363L;
 
-    @ApiModelProperty("工号")
-    private String userId;
-
-    @ApiModelProperty("用户名")
-    private String username;
-
-    @ApiModelProperty("手机号")
-    private String phoneNumber;
+    @ApiModelProperty("工号，用户名，手机号")
+    private String criteria;
 
     @ApiModelProperty("认证状态 1 认证成功 2 认证失败")
     private String authenticationStatus;

src/main/java/com/ydtech/modules/admin/service/impl/AppCustomerManagementImpl.java

@@ -42,9 +42,9 @@ public class AppCustomerManagementImpl implements AppCustomerManagementService {
 
             Page<SysUser> sysUserPage = sysUserService.lambdaQuery()
                     .eq(SysUser::getOperatorCode, userId)
-                    .eq(StringUtils.isEmpty(managementQueryVo.getPhoneNumber()), SysUser::getMobile, managementQueryVo.getPhoneNumber())
-                    .eq(StringUtils.isEmpty(managementQueryVo.getUserId()), SysUser::getId, managementQueryVo.getUserId())
-                    .eq(StringUtils.isEmpty(managementQueryVo.getUsername()), SysUser::getName, managementQueryVo.getUsername())
+                    .or(x-> x.eq(StringUtils.isEmpty(managementQueryVo.getCriteria()), SysUser::getMobile, managementQueryVo.getCriteria()))
+                    .or(x-> x.eq(StringUtils.isEmpty(managementQueryVo.getCriteria()), SysUser::getId, managementQueryVo.getCriteria()))
+                    .or(x-> x.eq(StringUtils.isEmpty(managementQueryVo.getCriteria()), SysUser::getName, managementQueryVo.getCriteria()))
                     .eq(StringUtils.isEmpty(managementQueryVo.getAuthenticationStatus()), SysUser::getName, managementQueryVo.getAuthenticationStatus())
                     .page(page);
 

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -532,7 +532,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         OrderVo orderAndAreaCompany = baseMapper.getOrderAndAreaCompany(companyId);
         //团队归属信息
         String areaInfo = sysDeptService.queryBelongArea(orderAndAreaCompany.getDeptid());
-        SysUser sysUser = sysUserService.getById(orderAndAreaCompany.getUserid());
+        SysUser sysUser = Optional.ofNullable(sysUserService.getById(orderAndAreaCompany.getUserid()))
+                .orElse(new SysUser());
+
         SysUserInfo sysUserInfo = sysUserInfoService.getById(orderAndAreaCompany.getUserid());
         if(!ObjectUtils.isEmpty(sysUserInfo)){
             if("M".equals(sysUserInfo.getSex())){

src/main/resources/mapper/modules/esm/EsmUserReferrerMapper.xml

@@ -116,27 +116,24 @@
 
     <select id="getByTeam" resultType="com.ydtech.modules.admin.model.dto.SysUserTeamDto">
         with recursive t1 as (select *
-                              from esm_user_referrer
-                              WHERE referrer_id = #{userId}
-                              union all
-                              select r1.*
-                              from esm_user_referrer r1
-                                       INNER JOIN t1 on t1.id = r1.referrer_id
-                              WHERE r1.level &lt; #{level})
-        select u.id, u.name, u.mobile, u.status
+        from esm_user_referrer
+        WHERE referrer_id = #{userId}
+        union all
+        select r1.*
+        from esm_user_referrer r1
+        INNER JOIN t1 on t1.id = r1.referrer_id
+        WHERE r1.level &lt; #{level})
+        select u.id as id , u.name as name , u.mobile as mobile, u.status as status
         from t1
-                 LEFT JOIN sys_user u on t1.id = u.id
-        <if test="managementQueryVo.userId != null and managementQueryVo.userId != ''">
-            AND sd.id = #{managementQueryVo.userId}
-        </if>
-        <if test="managementQueryVo.username != null and managementQueryVo.username != ''">
-            AND sd.id = #{managementQueryVo.username}
-        </if>
-        <if test="managementQueryVo.phoneNumber != null and managementQueryVo.phoneNumber != ''">
-            AND sd.id = #{managementQueryVo.phoneNumber}
+        LEFT JOIN sys_user u on t1.id = u.id
+        where 1=1
+        <if test="managementQueryVo.criteria != null and managementQueryVo.criteria != ''">
+            or u.id = #{managementQueryVo.criteria}
+            or u.name = #{managementQueryVo.criteria}
+            or u.mobile = #{managementQueryVo.criteria}
         </if>
         <if test="managementQueryVo.authenticationStatus != null and managementQueryVo.authenticationStatus != ''">
-            AND sd.id = #{managementQueryVo.authenticationStatus}
+            AND u.status = #{managementQueryVo.authenticationStatus}
         </if>
     </select>