Parcourir la source

修复履职子计划显示机构简称

luojun il y a 2 ans
Parent
commit
1b9beef7b6

+ 1 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -315,6 +315,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             plan.setPlanCreateOrgName(null);
             baseMapper.updateById(plan);
 
+            //修改所有子计划
             List<AppPlan> appPlans = baseMapper.selectList(new LambdaQueryWrapper<AppPlan>().eq(AppPlan::getParentId, plan.getId()));
             for (AppPlan ap :
                     appPlans) {

+ 3 - 3
soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppPlanMapper.xml

@@ -130,15 +130,15 @@
         d.roleNames,
         b.orgId,
         b.orgNames,
-        o.name as plan_of_org_name,
-        g.name as plan_create_org_name
+        o.short_name as plan_of_org_name,
+        g.short_name as plan_create_org_name
         FROM
         core_resumption_plan a
         left join sys_user u2 on u2.id=a.modified_by
         LEFT JOIN (
         SELECT
         m.plan_id,
-        GROUP_CONCAT( n.`name` ) orgNames,
+        GROUP_CONCAT( n.`short_name` ) orgNames,
         GROUP_CONCAT( n.id ) orgId
         FROM
         core_resumption_plan_to_exec_org m