guarantee-lsq 1 年間 前
コミット
a2ba42cd96

+ 2 - 2
platform-dao/src/main/resources/mapper/preparation/PreparationMapper.xml

@@ -161,9 +161,9 @@
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.preparation.PreparationDTO"
             resultType="com.platform.dao.vo.query.preparation.PreparationVO">
-        select preparation.*,applyU.real_name as userName,sp.name as positionName,spp.name as companyName,dept.name as deptName
+        select preparation.*,applyU.real_name as userName,sp.name as positionName,dept.name as deptName
         from t_preparation as preparation join t_sys_user applyU on preparation.user_id = applyU.user_id
-        join t_sb_position sp on preparation.position_id = sp.id join t_sb_position spp on preparation.parent_position_id = spp.id
+        join t_sb_position sp on preparation.position_id = sp.id
         join t_sys_dept dept on preparation.depart_id = dept.dept_id
         <where>
             <include refid="List_Condition"/>

+ 1 - 1
platform-service/src/main/java/com/platform/service/preparation/impl/PreparationServiceImpl.java

@@ -275,7 +275,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
     @Override
     public Preparation saveByDTO(PreparationDTO model) {
         // 获取公司ID
-        model.setParentPositionId(getParentPositionId(model.getPositionId()));
+        //model.setParentPositionId(getParentPositionId(model.getPositionId()));
         // 获取筹建主管角色,当一人时,直接赋值,多人时,接单派单
         SysUserDTO queryUserDTO = new SysUserDTO();
         queryUserDTO.setRoleCode(SysRoleCodeEnum.PREPARATION_MANAGER.name());