Merge branch 'feature/1.0.0' of github.com:ab-inbev-apac/abi-cloud-qr-platform into feature/1.0.0

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/UserInfo.java

@@ -58,6 +58,9 @@ public class UserInfo {
     @ApiModelProperty(value = "是否启用")
     private Integer isEnable;
 
+    @ApiModelProperty(value = "数据链标记")
+    private String linkFlag;
+
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createTime;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListUserReq.java

@@ -4,6 +4,7 @@ import com.abi.task.common.api.base.PageReq;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -14,16 +15,18 @@ import java.io.Serializable;
 @ApiModel
 public class ListUserReq extends PageReq implements Serializable {
 
-  @ApiModelProperty(value = "用户名")
-  private String userName;
+    @ApiModelProperty(value = "用户名")
+    private String userName;
 
-  @ApiModelProperty(value = "工号")
-  private String employeeNo;
+    @ApiModelProperty(value = "工号")
+    private String employeeNo;
 
     @ApiModelProperty(value = "角色code")
     private String roleCode;
 
-  @ApiModelProperty(value = "是否启用(状态)")
-  private Integer isEnable;
+    @ApiModelProperty(value = "是否启用(状态)")
+    private Integer isEnable;
 
+    @ApiModelProperty(value = "数据链标记")
+    private String linkFlag;
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/UserManagerServiceImpl.java

@@ -74,6 +74,8 @@ public class UserManagerServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo
         UserInfo userInfo1 = UserUtil.getUser();
         userInfo.setCreateBy(userInfo1.getId());
         save(userInfo);
+        userInfo.setLinkFlag(userInfo.getLinkFlag() + userInfo.getId() + ",");
+        updateById(userInfo);
         //添加用户和角色的映射关系
         QueryWrapper<UserMappingInfoRole> qwUR = new QueryWrapper<>();
         qwUR.eq("user_id", userInfo.getId());
@@ -144,6 +146,8 @@ public class UserManagerServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo
      **/
     @Override
     public ListUserRes listUser(ListUserReq listUserReq) {
+        UserInfo user = UserUtil.getUser();
+        listUserReq.setLinkFlag("," + user.getId() + ",");
         IPage iPage = userInfoMapper.selectUserInfoPage(PageUtil.createPage(listUserReq), listUserReq);
         List<UserInfo> records = iPage.getRecords();
         //封装出参

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/UserInfoMapper.xml

@@ -16,6 +16,7 @@
         <result column="factory_id" property="factoryId"/>
         <result column="is_enable" property="isEnable"/>
         <result column="role_code" property="roleCode"/>
+        <result column="link_flag" property="linkFlag"/>
         <result column="CREATE_TIME" property="createTime"/>
         <result column="CREATE_BY" property="createBy"/>
         <result column="UPDATE_TIME" property="updateTime"/>
@@ -40,6 +41,9 @@
         LEFT JOIN base_factory f ON u.factory_id = f.id
         LEFT JOIN user_role r ON u.role_code = r.role_code
         WHERE 1=1
+        <if test="req.linkFlag != null and req.linkFlag != ''">
+            AND u.link_flag LIKE CONCAT('%',#{req.linkFlag},'%')
+        </if>
         <if test="req.userName != null and req.userName != ''">
             AND u.USER_NAME LIKE CONCAT('%',#{req.userName},'%')
         </if>