Merge remote-tracking branch 'origin/bonus-jyy-smart-canteen' into bonus-jyy-smart-canteen

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java

@@ -31,6 +31,8 @@ public interface RemoteUserService {
     @GetMapping("/user/list}")
     public TableDataInfo list(SysUser user, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    @GetMapping("/user/list_all}")
+    public TableDataInfo listAll(SysUser user, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 通过用户名查询用户信息

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java

@@ -7,6 +7,8 @@ import com.bonus.common.core.annotation.Excels;
 import com.bonus.common.core.web.domain.BaseEntity;
 import com.bonus.common.core.xss.Xss;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -187,6 +189,22 @@ public class SysUser extends BaseEntity {
     @Excel(name = "生效截止日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date effectiveEndDay;
 
+    @Getter
+    @ApiModelProperty("查询类型")
+    private Integer queryTyoe = 1;
+
+    public void setQueryTyoe(Integer queryTyoe) {
+        this.queryTyoe = queryTyoe;
+    }
+
+    @Getter
+    @ApiModelProperty("查询类型")
+    private boolean bingStatus =  false;
+
+    public void setBingStatus(boolean bingStatus) {
+        this.bingStatus = bingStatus;
+    }
+
     public SysUser() {
 
     }

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java

@@ -38,6 +38,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
                 return getDataTableError(new ArrayList<SysUser>());
             }
 
+            @Override
+            public TableDataInfo listAll(SysUser user, String source) {
+                return getDataTableError(new ArrayList<SysUser>());
+            }
+
             @Override
             public R<LoginUser> getUserInfo(String username, String source)
             {

bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java

@@ -95,6 +95,20 @@ public class SysUserController extends BaseController {
         }
         return getDataTableError(new ArrayList<>());
     }
+    @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list"))
+    @GetMapping("/list_all")
+    @SysLog(title = "用户管理", businessType = OperaType.QUERY, logType = 0, module = "系统管理->用户管理", details = "查询用户列表")
+    public TableDataInfo listAll(SysUser user) {
+        try {
+            user .setQueryTyoe(2);
+            List<SysUser> list = userService.selectUserList(user);
+            return getDataTable(list);
+        } catch (Exception e) {
+            logger.error(e.toString(), e);
+        }
+        return getDataTableError(new ArrayList<>());
+    }
+
 
     @RequiresPermissions("system:user:export")
     @PostMapping("/export")
@@ -278,6 +292,7 @@ public class SysUserController extends BaseController {
      */
     //@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:query"))
     @GetMapping(value = {"/", "/{userId}"})
+//    @GetMapping("/{userId:\\d+}")
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
         try {
             userService.checkUserDataScope(userId);

bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java

@@ -158,4 +158,6 @@ public interface SysUserMapper {
     Integer approvalStatus(Long userId);
 
     int systemUpdateUser(SysUser user);
+
+    List<Long> selectBindUserIds();
 }

bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java

@@ -118,10 +118,19 @@ public class SysUserServiceImpl implements ISysUserService {
         //    user.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
         //}
         List<SysUser> sysUsers = userMapper.selectUserList(user);
+
         for (SysUser sysUser : sysUsers) {
             sysUser.setPhotoUrl(remoteFileService.getFullFileUrl(sysUser.getPhotoUrl()));
         }
+        if(user.getQueryTyoe()==1){
             return sysUsers;
+        }else{
+            List<Long> userIds = userMapper.selectBindUserIds();
+            Set<Long> userIdSet = new HashSet<>(userIds);
+            sysUsers.forEach(s -> s.setBingStatus(userIdSet.contains(s.getUserId())));
+            return sysUsers;
+        }
+
     }
 
     public List<SysUser> selectUserList4Job(SysUser user) {

bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -428,5 +428,8 @@
         </foreach>
     </delete>
 
-
+    <select id="selectBindUserIds" resultType="java.lang.Long">
+        select supplier_user_id from ims_supplier WHERE del_flag = '0'
+        group by supplier_id
+    </select>
 </mapper>