From 9e9bc96ae861e4d416a37ee412905f9f787083f0 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 01 七月 2025 16:59:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryUserController.java | 12 ++++++------
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java | 4 ++--
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java | 4 ++--
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java | 6 +++---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/service/impl/BaseFactoryServiceImpl.java | 7 ++++++-
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java | 2 +-
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml | 2 +-
7 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryUserController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryUserController.java
index 6ea1d2b..2f1250a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryUserController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryUserController.java
@@ -68,9 +68,9 @@
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
- String BaseFactoryId = req.getParameter("BaseFactoryId");
+ String baseFactoryId = req.getParameter("factoryId");
String username=req.getParameter("username");
- IPage<SysUser> pageList = sysUserService.getUserByworkShopDepartId(page, BaseFactoryId,username);
+ IPage<SysUser> pageList = sysUserService.getUserByworkShopDepartId(page, baseFactoryId,username);
result.setSuccess(true);
result.setResult(pageList);
return result;
@@ -127,9 +127,9 @@
@ApiOperation(value="璁惧杞﹂棿绠＄悊涓庣敤鎴�-閫氳繃id鍒犻櫎", notes="璁惧杞﹂棿绠＄悊涓庣敤鎴�-閫氳繃id鍒犻櫎")
//@RequiresPermissions("org.jeecg.modules.mdc:sys_work_shop_depart_user:delete")
@DeleteMapping(value = "/delete")
- public Result<String> delete(String id, String BaseFactoryId) {
+ public Result<String> delete(String id, String factoryId) {
QueryWrapper<BaseFactoryUser> queryWrapper = new QueryWrapper<BaseFactoryUser>();
- queryWrapper.eq("work_shop_depart_id", BaseFactoryId)
+ queryWrapper.eq("factory_id", factoryId)
.eq("user_id", id);
BaseFactoryUserService.remove(queryWrapper);
return Result.OK("鍒犻櫎鎴愬姛!");
@@ -145,9 +145,9 @@
@ApiOperation(value="璁惧杞﹂棿绠＄悊涓庣敤鎴�-鎵归噺鍒犻櫎", notes="璁惧杞﹂棿绠＄悊涓庣敤鎴�-鎵归噺鍒犻櫎")
//@RequiresPermissions("org.jeecg.modules.mdc:sys_work_shop_depart_user:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(String ids,String BaseFactoryId) {
+ public Result<String> deleteBatch(String ids,String factoryId) {
QueryWrapper<BaseFactoryUser> queryWrapper = new QueryWrapper<BaseFactoryUser>();
- queryWrapper.eq("work_shop_depart_id", BaseFactoryId)
+ queryWrapper.eq("factory_id", factoryId)
.in("user_id", Arrays.asList(ids.split(",")));
BaseFactoryUserService.remove(queryWrapper);
return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/service/impl/BaseFactoryServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/service/impl/BaseFactoryServiceImpl.java
index 8507439..beb7785 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/service/impl/BaseFactoryServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/service/impl/BaseFactoryServiceImpl.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.base.service.impl;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -106,8 +107,12 @@
@Transactional(rollbackFor = Exception.class)
public void saveBaseFactoryData(BaseFactory BaseFactory) {
if (BaseFactory != null) {
- if (BaseFactory.getParentId() == null) {
+ if (BaseFactory.getParentId() == null|| StrUtil.isEmpty(BaseFactory.getParentId())) {
BaseFactory.setParentId("");
+ BaseFactory.setFactoryCategory("0");
+ }
+ if (BaseFactory.getFactoryCategory() == null|| StrUtil.isEmpty(BaseFactory.getFactoryCategory())) {
+ BaseFactory.setFactoryCategory("1");
}
BaseFactory.setId(IdWorker.getIdStr(BaseFactory));
// 鍏堝垽鏂瀵硅薄鏈夋棤鐖剁骇ID,鏈夊垯鎰忓懗鐫�涓嶆槸鏈�楂樼骇,鍚﹀垯鎰忓懗鐫�鏄渶楂樼骇
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
index 99fd90f..b6b7e7b 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
@@ -201,9 +201,9 @@
*/
@TableField(exist = false)
private String homePath;
- @Dict(dicCode = "id",dictTable = "mom_base_team",dicText = "name")
+// @Dict(dicCode = "id",dictTable = "mom_base_team",dicText = "name")
private String teamId;
- @Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
+// @Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
private String areaId;
/**
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
index 1ea2fdb..754e8ed 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
@@ -69,7 +69,7 @@
* @param workShopDepartId 璁惧杞﹂棿绠＄悊Id
* @return
*/
- IPage<SysUser> getUserByWorkShopDepartId(Page page, @Param("workShopDepartId") String workShopDepartId, @Param("username") String username);
+ IPage<SysUser> getUserByWorkShopDepartId(Page page, @Param("baseFactoryId") String baseFactoryId, @Param("username") String username);
/**
* 鏍规嵁鐢ㄦ埛鍚嶈缃儴闂↖D
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
index 9a75b55..6aa707b 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
@@ -231,7 +231,7 @@
</foreach>
</select>
<select id="getUserByWorkShopDepartId" resultType="org.jeecg.modules.system.entity.SysUser">
- select * from sys_user where del_flag = 0 and id in (select user_id from mom_eam_work_shop_depart_user where work_shop_depart_id = #{workShopDepartId})
+ select * from sys_user where del_flag = 0 and id in (select user_id from eam_base_factory_user where factory_id = #{baseFactoryId})
<if test="username!=null and username!=''">
and username = #{username}
</if>
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
index 054f458..cf414ed 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
@@ -167,10 +167,10 @@
/**
* 鏍规嵁璁惧杞﹂棿绠＄悊Id鏌ヨ
* @param page
- * @param workShopDepartId 璁惧杞﹂棿绠＄悊Id
+ * @param baseFactoryId 璁惧杞﹂棿绠＄悊Id
* @return
*/
- public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String workShopDepartId,String username);
+ public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String baseFactoryId,String username);
/**
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
index 3540c10..f9c8e61 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -362,11 +362,11 @@
/**
* 鏍规嵁璁惧杞﹂棿绠＄悊Id鏌ヨ
* @param page
- * @param workShopDepartId 璁惧杞﹂棿绠＄悊Id
+ * @param baseFactoryId 璁惧杞﹂棿绠＄悊Id
* @return
*/
- public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String workShopDepartId,String username){
- return userMapper.getUserByWorkShopDepartId(page,workShopDepartId,username);
+ public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String baseFactoryId,String username){
+ return userMapper.getUserByWorkShopDepartId(page,baseFactoryId,username);
}
--
Gitblit v1.9.3