diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java index 9f9f344..8156cf4 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -4,10 +4,8 @@ import com.adc.da.base.web.BaseController; import com.adc.da.excel.poi.excel.ExcelImportUtil; import com.adc.da.excel.poi.excel.entity.ImportParams; import com.adc.da.sys.constant.SysConstants; -import com.adc.da.sys.dao.mysql.UserOrgEODao; import com.adc.da.sys.entity.OrgEO; import com.adc.da.sys.entity.UserEO; -import com.adc.da.sys.entity.UserOrgEO; import com.adc.da.sys.service.iservice.IUserEoService; import com.adc.da.sys.util.EncryptUtil; import com.adc.da.sys.util.RSAUtil; @@ -17,7 +15,6 @@ import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; import com.adc.da.util.utils.FileUtil; import com.adc.da.util.utils.StringUtils; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -26,7 +23,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.binary.Base64; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -40,7 +36,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -53,9 +48,6 @@ public class UserEOController extends BaseController { @Resource private IUserEoService userEOService; - @Autowired - private UserOrgEODao userOrgEODao; - @Value("${isPassEncrypted}") private boolean isPassEncrypted; @@ -121,22 +113,7 @@ public class UserEOController extends BaseController { userEOService.save(eo); - //保存部门 - LambdaQueryWrapper userOrgEOLambdaQueryWrapper = new LambdaQueryWrapper<>(); - userOrgEOLambdaQueryWrapper.eq(UserOrgEO::getUserId,eo.getUsid()); - userOrgEODao.delete(userOrgEOLambdaQueryWrapper); - String orgId = eo.getOrgId(); - if (StringUtils.isNotEmpty(orgId)){ - String[] split = orgId.split(","); - List userOrgEOS = new ArrayList<>(); - for (String s : split) { - UserOrgEO userOrgEO = new UserOrgEO(); - userOrgEO.setUserId(eo.getUsid()); - userOrgEO.setOrgId(s); - userOrgEOS.add(userOrgEO); - } - userOrgEODao.insertBatch(userOrgEOS); - } + return Result.success(); } @@ -245,7 +222,7 @@ public class UserEOController extends BaseController { @ApiOperation(value = "查询自己领导") @GetMapping("getOwnLeader") public ResponseMessage getOwnLeader(String userId){ - UserEO userEoById = userEOService.getUserEoById(userId); + UserVO userEoById = userEOService.getUserEoById(userId); List orgEOList = userEoById.getOrgEOList(); List leaderList = userEOService.getOwnLeader(orgEOList); return Result.success(leaderList); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java index 98019d2..3c9875f 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java @@ -42,7 +42,7 @@ public interface UserEODao extends BaseMapper { List> allList( @Param("account") String account, @Param("roleName") String roleName); - UserEO getUserEoById(@Param("usid") String usid); + UserVO getUserEoById(@Param("usid") String usid); UserEO selectUserByIdNodel(String userId); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java index ab731bd..50f6ed5 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java @@ -185,8 +185,8 @@ public class UserEOServiceImpl implements IUserEoService { } @Override - public UserEO getUserEoById(String usid) { - UserEO userEO = dao.getUserEoById(usid); + public UserVO getUserEoById(String usid) { + UserVO userEO = dao.getUserEoById(usid); return userEO; } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java index f7f8a9b..2e16baa 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java @@ -36,7 +36,7 @@ public interface IUserEoService { UserEO getUserById(String usid); - UserEO getUserEoById(String usid); + UserVO getUserEoById(String usid); List getUserByIdList(List userIdList); diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml index 00ffa4c..bbb8148 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml @@ -184,7 +184,7 @@ #{id} - select users.usid, users.usname, @@ -201,9 +201,9 @@ o.bmdm_14 as o_bmdm14 from TS_USER users left join TR_USER_ROLE ur on users.usid = ur.user_id - left join TS_ROLE r on ur.role_id = r.id + left join TS_ROLE r on ur.role_id = r.id and r.del_flag = 0 left join TR_USER_ORG uo on users.usid = uo.user_id - left join TS_ORG o on uo.org_id = o.org_code + left join TS_ORG o on uo.org_id = o.org_code and o.status = 1 where users.del_flag != 1 and users.usid=#{usid} @@ -262,7 +262,7 @@ uo.org_id in - #{item.Id} + #{item.id} and (u.level_id=5 or u.level_id=9) and u.employee_type_id = 1 diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class index 9b869de..b331026 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class and b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/UserEODao.class b/adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/UserEODao.class index f180a61..63797cf 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/UserEODao.class and b/adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/UserEODao.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class b/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class index 47b6da4..d4c2fce 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class and b/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/service/iservice/IUserEoService.class b/adc-da-sys/target/classes/com/adc/da/sys/service/iservice/IUserEoService.class index 88db361..9703466 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/service/iservice/IUserEoService.class and b/adc-da-sys/target/classes/com/adc/da/sys/service/iservice/IUserEoService.class differ diff --git a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml index 00ffa4c..bbb8148 100644 --- a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml @@ -184,7 +184,7 @@ #{id} - select users.usid, users.usname, @@ -201,9 +201,9 @@ o.bmdm_14 as o_bmdm14 from TS_USER users left join TR_USER_ROLE ur on users.usid = ur.user_id - left join TS_ROLE r on ur.role_id = r.id + left join TS_ROLE r on ur.role_id = r.id and r.del_flag = 0 left join TR_USER_ORG uo on users.usid = uo.user_id - left join TS_ORG o on uo.org_id = o.org_code + left join TS_ORG o on uo.org_id = o.org_code and o.status = 1 where users.del_flag != 1 and users.usid=#{usid} @@ -262,7 +262,7 @@ uo.org_id in - #{item.Id} + #{item.id} and (u.level_id=5 or u.level_id=9) and u.employee_type_id = 1 diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class index bb98d85..c3f3d33 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class differ