用户下拉，供应商下拉接口添加id过滤

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierController.java

@@ -135,8 +135,9 @@ public class SmErpSupplierController {
      */
     @Operation(summary = "通过id查询" , description = "通过id查询" )
     @GetMapping("/selectSimpleAll" )
-    public R selectSimpleAll(@RequestParam(value = "name",required = false)String name) {
-        List<SmErpSupplierEntity> list = smErpSupplierService.selectSimpleAllScope(name);
+    public R selectSimpleAll(@RequestParam(value = "name",required = false)String name,
+                             @RequestParam(value = "supplierId",required = false)Long supplierId) {
+        List<SmErpSupplierEntity> list = smErpSupplierService.selectSimpleAllScope(name,supplierId);
         List<SmErpSupplierSimpleVo> bean = BeanUtils.toBean(list, SmErpSupplierSimpleVo.class);
         return R.ok(bean);
     }

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSupplierService.java

@@ -17,7 +17,7 @@ public interface SmErpSupplierService extends IService<SmErpSupplierEntity> {
      * 隔离查询
      * @return
      */
-    List<SmErpSupplierEntity> selectSimpleAllScope(String name);
+    List<SmErpSupplierEntity> selectSimpleAllScope(String name,Long supplierId);
 
 
     /**

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSupplierServiceImpl.java

@@ -38,11 +38,12 @@ public class SmErpSupplierServiceImpl extends ServiceImpl<SmErpSupplierMapper, S
 
     private final SmErpSupplierTypeMapper supplierTypeMapper;
     @Override
-    public List<SmErpSupplierEntity> selectSimpleAllScope(String name) {
-        LambdaQueryWrapper<SmErpSupplierEntity> eq = new LambdaQueryWrapper<SmErpSupplierEntity>()
-                .eq(SmErpSupplierEntity::getStatus, "0")
-                .like(StringUtils.isNotBlank(name),SmErpSupplierEntity::getSupplierName,name);
-        return baseMapper.selectListByScope(eq, DataScope.of());
+    public List<SmErpSupplierEntity> selectSimpleAllScope(String name,Long supplierId) {
+        LambdaQueryWrapper<SmErpSupplierEntity> wrapper = new LambdaQueryWrapper<SmErpSupplierEntity>();
+                wrapper.eq(SmErpSupplierEntity::getStatus, "0");
+                wrapper.like(StringUtils.isNotBlank(name),SmErpSupplierEntity::getSupplierName,name);
+                wrapper.eq(supplierId!=null,SmErpSupplierEntity::getSupplierId,supplierId);
+        return baseMapper.selectListByScope(wrapper, DataScope.of());
     }
 
     @Override

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java

@@ -431,10 +431,14 @@ public class SysUserController {
 
     @GetMapping("/getSimpleUserAll")
     @Schema(description = "简要用户信息")
-    public R<List<SimpleUserAllListVO>> getSimpleUserAllList(@RequestParam(value = "mobile", required = false) String mobile, @RequestParam(value = "name", required = false) String name) {
+    public R<List<SimpleUserAllListVO>> getSimpleUserAllList(
+            @RequestParam(value = "mobile", required = false) String mobile,
+            @RequestParam(value = "name", required = false) String name,
+            @RequestParam(value = "userId", required = false) Long userId) {
         LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
         sysUserLambdaQueryWrapper.like(StringUtils.isNotBlank(mobile), SysUser::getPhone, mobile);
         sysUserLambdaQueryWrapper.like(StringUtils.isNotBlank(name), SysUser::getName, name);
+        sysUserLambdaQueryWrapper.eq(SysUser::getUserId, userId);
         List<SimpleUserAllListVO> list = userService.listScope(sysUserLambdaQueryWrapper);
         return R.ok(list);
     }