杰生重构

bladex/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -36,6 +36,7 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.annotation.PreAuth;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tenant.mp.TenantEntity;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.constant.RoleConstant;
@@ -333,4 +334,17 @@ public class UserController {
 		return R.success("操作成功");
 	}
 
+	/**
+	 * 跟据角色id获取用户列表
+	 */
+	@PostMapping("/getListByRole")
+	public R getUserListByRole(@RequestBody User user) {
+		String roleId = user.getRoleId();
+		List<User> userList = userService.list(Wrappers.<User>lambdaQuery()
+				.like(User::getRoleId, roleId)
+				.eq(TenantEntity::getTenantId, AuthUtil.getTenantId())
+		);
+		return R.data(userList);
+	}
+
 }

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockCheckrecordServiceImpl.java

@@ -105,33 +105,33 @@ public class StockCheckrecordServiceImpl extends ServiceImpl<StockCheckrecordMap
         List<String> copyRfidList = new ArrayList<>(rfidList);
 
         // 默认在库rfid
-        List<Map<String, Object>> inHouseMaterialCodeList = stockDetailService.listMaps(Wrappers.<StockDetail>query()
-                .select("MaterialCode materialCode")
-                .eq("IsDelete", 0)
-                .eq("StockHouseId", stockHouseId)
-                .ge("ExpiredDt", new Date())
-        );
-
-        List<String> materialCodeList = inHouseMaterialCodeList.stream()
-                .map(item -> Convert.toStr(item.get("materialCode"))).distinct().collect(Collectors.toList());
-
-        if (materialCodeList.size() > 0) {
-
-            List<Map<String, Object>> inHouseList = stockDetailService.listMaps(Wrappers.<StockDetail>query()
-                    .select("RfidCode rfidCode")
-                    .eq("IsDelete", 0)
-                    .eq("StockHouseId", stockHouseId)
-                    .in("MaterialCode", materialCodeList)
-            );
-
-            for (Map<String, Object> map : inHouseList) {
-                String rfidCode = Convert.toStr(map.get("rfidCode"));
-                if (!rfidList.contains(rfidCode)) {
-                    rfidList.add(rfidCode);
-                }
-            }
-
-        }
+        // List<Map<String, Object>> inHouseMaterialCodeList = stockDetailService.listMaps(Wrappers.<StockDetail>query()
+        //         .select("MaterialCode materialCode")
+        //         .eq("IsDelete", 0)
+        //         .eq("StockHouseId", stockHouseId)
+        //         .ge("ExpiredDt", new Date())
+        // );
+        //
+        // List<String> materialCodeList = inHouseMaterialCodeList.stream()
+        //         .map(item -> Convert.toStr(item.get("materialCode"))).distinct().collect(Collectors.toList());
+        //
+        // if (materialCodeList.size() > 0) {
+        //
+        //     List<Map<String, Object>> inHouseList = stockDetailService.listMaps(Wrappers.<StockDetail>query()
+        //             .select("RfidCode rfidCode")
+        //             .eq("IsDelete", 0)
+        //             .eq("StockHouseId", stockHouseId)
+        //             .in("MaterialCode", materialCodeList)
+        //     );
+        //
+        //     for (Map<String, Object> map : inHouseList) {
+        //         String rfidCode = Convert.toStr(map.get("rfidCode"));
+        //         if (!rfidList.contains(rfidCode)) {
+        //             rfidList.add(rfidCode);
+        //         }
+        //     }
+        //
+        // }
 
         log.error("\r\n盘点结束：\r\n扫描仓库：{}\r\n扫描到的rfid：{},\r\n添加默认在库后的rfid：{}",
                 (stockHouseId.equals("c185883dba22478cb593d33f6b66cc53") ? "一楼仓库：" : "四楼仓库：") + stockHouseId,