admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

Browse Source
This commit is contained in:
guo 2024-04-13 11:40:33 +08:00
commit cb6d110838
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java
View File

@ -139,7 +139,8 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
@Override
public List<OrgTreeVo> getSubDeptById(String parentId) {
return xzProjectOrgMapper.selectByDept(parentId);
int p = parentId.indexOf("P");
return xzProjectOrgMapper.selectByDept(parentId.substring(0, p), parentId.substring(p + 1));
}
@Override

4
src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzProjectOrgMapper.java
View File

@ -32,6 +32,6 @@ public interface XzProjectOrgMapper extends BaseMapper<XzProjectOrg> {
* @param deptId 父部门
* @return 子部门列表，type字段固定返回固定值 dept
*/
@Select("SELECT id id, dept_name `name`, 'dept' AS 'type' FROM xz_project_org WHERE parent_id=#{deptId}")
List<OrgTreeVo> selectByDept(@Param("deptId") String deptId);
@Select("SELECT id id, dept_name `name`, 'dept' AS 'type' FROM xz_project_org WHERE parent_id=#{deptId} AND project_sn = #{projectSn}")
List<OrgTreeVo> selectByDept(@Param("deptId") String deptId, @Param("projectSn") String projectSn);
}