Merge remote-tracking branch 'origin/V0.0.1' into V0.0.1

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteOrgService.java

@@ -44,8 +44,8 @@ public interface RemoteOrgService {
     @GetMapping("/dept/listByIds")
     R<List<SysOrg>> listByIds(List<Long> ids, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
-    @GetMapping("/dept/findListByOrgType")
-    R<List<Long>> findListByOrgType(Integer execOrgType, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    @PostMapping("/dept/findListByOrgType")
+    R<List<Long>> findListByOrgType(@RequestBody Integer execOrgType, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @PostMapping("/org/sync/batch")
     R<Boolean> batchSaveSyncOrg(@RequestBody List<SysOrg> orgList, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@@ -87,5 +87,5 @@ public interface RemoteOrgService {
      * @return
      */
     @PostMapping("/org/getParentNames")
-    R<List<IdNameVo>> getParentName(@RequestBody  List<Long> ids);
+    R<List<IdNameVo>> getParentName(@RequestBody  List<Long> ids,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteOrgFallbackFactory.java

@@ -98,7 +98,7 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
                 return new ArrayList<>();
             }
             @Override
-            public R<List<IdNameVo>> getParentName(List<Long> ids){
+            public R<List<IdNameVo>> getParentName(List<Long> ids, String source){
                 return R.ok(new ArrayList<>()) ;
             }
 

soc-common/soc-common-security/src/main/java/com/xunmei/common/security/config/WebMvcConfig.java

@@ -1,22 +1,32 @@
 package com.xunmei.common.security.config;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.xunmei.common.security.interceptor.HeaderInterceptor;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import java.math.BigInteger;
+
 /**
  * 拦截器配置
  *
  * @author xunmei
  */
-public class WebMvcConfig implements WebMvcConfigurer
-{
-    /** 不需要拦截地址 */
-    public static final String[] excludeUrls = { "/login", "/logout", "/refresh", "/code/**" };
+public class WebMvcConfig implements WebMvcConfigurer, ApplicationContextAware {
+    /**
+     * 不需要拦截地址
+     */
+    public static final String[] excludeUrls = {"/login", "/logout", "/refresh", "/code/**"};
 
     @Override
-    public void addInterceptors(InterceptorRegistry registry)
-    {
+    public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(getHeaderInterceptor())
                 .addPathPatterns("/**")
                 .excludePathPatterns(excludeUrls)
@@ -26,8 +36,21 @@ public class WebMvcConfig implements WebMvcConfigurer
     /**
      * 自定义请求头拦截器
      */
-    public HeaderInterceptor getHeaderInterceptor()
-    {
+    public HeaderInterceptor getHeaderInterceptor() {
         return new HeaderInterceptor();
     }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+//        final AbstractJackson2HttpMessageConverter httpMessageConverter = applicationContext.getBean(AbstractJackson2HttpMessageConverter.class);
+//        final ObjectMapper objectMapper = httpMessageConverter.getObjectMapper();
+//        SimpleModule simpleModule = new SimpleModule();
+//        simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
+//        simpleModule.addSerializer(BigInteger.class, ToStringSerializer.instance);
+//        simpleModule.addSerializer(long.class, ToStringSerializer.instance);
+//        objectMapper.configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true);
+//        objectMapper.registerModule(simpleModule);
+//        httpMessageConverter.setObjectMapper(objectMapper);
+//        objectMapper.registerModule(new com.fasterxml.jackson.dataty())
+    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppPlan.java

@@ -41,7 +41,7 @@ public class AppPlan extends Model<AppPlan> implements Serializable {
      */
 
     private String planName;
-    private List<AppPlan> children;
+//    private List<AppPlan> children;
     /**
      * 计划类型 0：履职计划，1，安全检查，2教育培训
      */
@@ -90,7 +90,7 @@ public class AppPlan extends Model<AppPlan> implements Serializable {
     /**
      * 计划创建机构id
      */
-    private String planCreateOrgId;
+    private Long planCreateOrgId;
     /**
      * 计划所属机构名称
      */
@@ -99,7 +99,7 @@ public class AppPlan extends Model<AppPlan> implements Serializable {
     /**
      * 计划所属机构id
      */
-    private String planOfOrgId;
+    private Long planOfOrgId;
     /**
      * 计划执行次数
      */

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

@@ -161,7 +161,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             AppPlan plan = baseMapper.selectById(dto.getId());
             plan.setOrgId(d.getOrgId().toString());
             plan.setDistributeStatus("1");
-            plan.setPlanOfOrgId(d.getOrgId().toString());
+            plan.setPlanOfOrgId(d.getOrgId());
             plan.setPlanStatus(d.getStatus());
             plan.setDistributePlanStatus(d.getStatus().toString());
             plan.setId(null);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppRuleServiceImpl.java

@@ -111,7 +111,10 @@ public class AppRuleServiceImpl extends ServiceImpl<AppRuleMapper, AppRule> impl
     public List<IdNameVo> ruleListForOrg(AppRuleListForOrgDto dto) {
         Long loginOrgId = SecurityUtils.getLoginUser().getOrgId();
         List<Long> upOrgIds = remoteOrgService.getUpOrgs(loginOrgId);
-
+        if(CollectionUtil.isEmpty(upOrgIds)){
+            return new ArrayList<>();
+        }
+        
         List<AppRule> rules = appRuleMapper.selectList(new LambdaQueryWrapper<AppRule>()
                 .in(AppRule::getOrgId, upOrgIds)
                 .eq(AppRule::getOrgType, dto.getOrgType())

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/ResumptionRecordServiceImpl.java

@@ -224,7 +224,7 @@ public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMap
 
 //        List<IdNameVo> planList = appPlanMapper.selectPlanNames(list.stream().map(i -> i.getPlanId()).distinct().collect(Collectors.toList()));
         List<IdNameVo> orgNames = orgService.getParentName(list.stream()
-                        .map(i -> i.getOrgId()).distinct().collect(Collectors.toList()))
+                        .map(i -> i.getOrgId()).distinct().collect(Collectors.toList()),SecurityConstants.INNER)
                 .getData();
         List<IdNameVo> roleNames = roleService.getNames(RoleConditionEto
                 .builder()
@@ -233,11 +233,14 @@ public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMap
 
         //List<Org> orgList = orgService.all();
         for (ResumptionRecordPageVo vo : list) {
-            Optional<IdNameVo> org = orgNames.stream().filter(i -> ObjectUtil.equal(vo.getOrgId(), i.getId())).findFirst();
-            if (org.isPresent()) {
-                vo.setOrgName(org.get().getName());
-                vo.setParentOrgName(org.get().getExtra());
+            if (ObjectUtil.isNotEmpty(orgNames)) {
+                Optional<IdNameVo> org = orgNames.stream().filter(i -> ObjectUtil.equal(vo.getOrgId(), i.getId())).findFirst();
+                if (org.isPresent()) {
+                    vo.setOrgName(org.get().getName());
+                    vo.setParentOrgName(org.get().getExtra());
+                }
             }
+
 //            Optional<IdNameVo> plan=planList.stream().filter(i -> ObjectUtil.equal(vo.getPlanId(), i.getId())).findFirst();
 //            if (plan.isPresent()) {
 //                vo.setPlanName(plan.get().getName());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/task/ResumptionTaskBusiness.java

@@ -3,6 +3,7 @@ package com.xunmei.core.resumption.task;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.xunmei.common.core.constant.SecurityConstants;
@@ -19,6 +20,7 @@ import com.xunmei.common.core.utils.ResumptionStatus;
 import com.xunmei.common.core.utils.ResumptionType;
 import com.xunmei.core.resumption.vo.AppRulePointTaskVo;
 import com.xunmei.core.resumption.vo.WorkChangeResumptionVo;
+import com.xunmei.system.api.Eto.OrgListByTypesConditionEto;
 import com.xunmei.system.api.RemoteConfigService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteWorkTimeService;
@@ -56,7 +58,6 @@ public class ResumptionTaskBusiness {
     private RemoteConfigService systemParameService;
 
 
-
 //    @Resource
 //    DelayTaskService delayTaskService;
     /**
@@ -110,8 +111,8 @@ public class ResumptionTaskBusiness {
             List<NFCBindPageVo> nfcList =  nfcBindService.all(jobDto,NFCBindPageVo::to);*/
             //获取有 作息的机构id
             R<List<Long>> listR = workTimeService.findOrgIdsByYmd(dateTime.toString().substring(0, 10), SecurityConstants.INNER);
-            List<Long> orgIdsNew=new ArrayList<>();
-            if (listR.getCode()==200) {
+            List<Long> orgIdsNew = new ArrayList<>();
+            if (listR.getCode() == 200) {
                 orgIdsNew = listR.getData();
             }
             List<Long> finalOrgIdsNew = orgIdsNew;
@@ -123,10 +124,10 @@ public class ResumptionTaskBusiness {
                 jobDto.setNfcBindIdList(new ArrayList(nfcBindIdList));
                 jobDto.setOrgId(orgId);
                 List<NFCBindPageVo> nfcList =  nfcBindService.all(jobDto,NFCBindPageVo::to);*/
-                Ymd ymd=toYmd(dateTime,"DAY");
+                Ymd ymd = toYmd(dateTime, "DAY");
                 ymd.setOrgId(orgId);
                 ymd.setEnable(true);
-                SysWorkTime workTime =workTimeService.findWorkTimeByYmd(ymd).getData();
+                SysWorkTime workTime = workTimeService.findWorkTimeByYmd(ymd).getData();
                 if (workTime != null) {
                     List<String[]> workTimes = new ArrayList<>();
                     if (appPlan.getNotResumptionOnRest() != null && appPlan.getNotResumptionOnRest() == 1 &&
@@ -203,7 +204,8 @@ public class ResumptionTaskBusiness {
         //获取履职计划
         List<AppPlan> AppPlanList = appPlanService.list((new QueryWrapper<AppPlan>()).lambda()
                 .eq(AppPlan::getPlanStatus, 1)
-                .eq(AppPlan::getPlanCycle, plancycle));
+                .eq(AppPlan::getPlanCycle, plancycle)
+                .in(AppPlan::getPlanOfOrgId, getHangsheOrgIds()));
 //                .eq(AppPlan::getPlanType, 1)
 //                .notIn(AppPlan::getPlanExec, canteenPlanExec));
         for (AppPlan appPlan : AppPlanList) {
@@ -277,10 +279,10 @@ public class ResumptionTaskBusiness {
 //                    workTime.setOpenTime("00:00");
 //                    workTime.setCloseTime("23:59");
 //                } else {
-                    Ymd ymd=toYmd(dateTime,"DAY");
-                    ymd.setOrgId(orgId);
-                    ymd.setEnable(true);
-                    workTime = this.workTimeService.findWorkTimeByYmd(ymd).getData();
+                Ymd ymd = toYmd(dateTime, "DAY");
+                ymd.setOrgId(orgId);
+                ymd.setEnable(true);
+                workTime = this.workTimeService.findWorkTimeByYmd(ymd).getData();
 //                }
 
                 DateTime planstartTime = null;
@@ -347,7 +349,8 @@ public class ResumptionTaskBusiness {
     public void syncWeek(DateTime dateTime, int plancycle) {//plancycle==1
         List<AppPlan> AppPlanList = appPlanService.list((new QueryWrapper<AppPlan>()).lambda()
                 .eq(AppPlan::getPlanStatus, 1)
-                .eq(AppPlan::getPlanCycle, plancycle));
+                .eq(AppPlan::getPlanCycle, plancycle)
+                .in(AppPlan::getPlanOfOrgId, getHangsheOrgIds()));
 //                        .eq(AppPlan::getPlanType, 0)
 //                .notIn(AppPlan::getPlanExec, canteenPlanExec));
         KeyValue<Integer, Integer> yearWeek = new KeyValue<>(DateUtil.year(dateTime), DateUtil.weekOfYear(dateTime));
@@ -394,7 +397,7 @@ public class ResumptionTaskBusiness {
                 jobDto.setOrgId(orgId);
                 List<NFCBindPageVo> nfcList =  nfcBindService.all(jobDto,NFCBindPageVo::to);*/
                 // 判断这周是否有作息
-                boolean isExist = workTimeService.existByYmd( Ymd.builder().year(yearWeek.getKey()).week(yearWeek.getValue()).orgId(orgId).isEnable(true).build()).getData();
+                boolean isExist = workTimeService.existByYmd(Ymd.builder().year(yearWeek.getKey()).week(yearWeek.getValue()).orgId(orgId).isEnable(true).build()).getData();
 //                final boolean isExist = false;
                 // 应该用周的第一天, 不然页面查是查询不到的
                 //dateTime即为本周第一天
@@ -419,7 +422,8 @@ public class ResumptionTaskBusiness {
     public void syncMonth(DateTime dateTime, int plancycle) {//plancycle==2
         List<AppPlan> AppPlanList = appPlanService.list((new QueryWrapper<AppPlan>()).lambda()
                 .eq(AppPlan::getPlanStatus, 1)
-                .eq(AppPlan::getPlanCycle, plancycle));
+                .eq(AppPlan::getPlanCycle, plancycle)
+                .in(AppPlan::getPlanOfOrgId, getHangsheOrgIds()));
 //                .eq(AppPlan::getPlanType, 0)
 //                .notIn(AppPlan::getPlanExec, canteenPlanExec));
         KeyValue<Integer, Integer> yearMonth = new KeyValue<>(DateUtil.year(dateTime), DateUtil.month(dateTime) + 1);
@@ -468,7 +472,7 @@ public class ResumptionTaskBusiness {
                 List<NFCBindPageVo> nfcList =  nfcBindService.all(jobDto,NFCBindPageVo::to);*/
                 // 判断这月是否有作息
 //                final boolean isExist = this.workTimeService.existByYmd(orgId, Ymd.builder().year(yearMonth.getKey()).month(yearMonth.getValue()).build(), true);
-                final boolean isExist = workTimeService.existByYmd( Ymd.builder().year(yearMonth.getKey()).week(yearMonth.getValue()).orgId(orgId).isEnable(true).build()).getData();
+                final boolean isExist = workTimeService.existByYmd(Ymd.builder().year(yearMonth.getKey()).week(yearMonth.getValue()).orgId(orgId).isEnable(true).build()).getData();
 
                 // 应该用月的第一天, 不然页面查是查询不到的
                 //dateTime即为本月第一天
@@ -491,7 +495,8 @@ public class ResumptionTaskBusiness {
     public void syncQuarter(DateTime dateTime, int plancycle) {//plancycle==3
         List<AppPlan> AppPlanList = appPlanService.list((new QueryWrapper<AppPlan>()).lambda()
                 .eq(AppPlan::getPlanStatus, 1)
-                .eq(AppPlan::getPlanCycle, plancycle));
+                .eq(AppPlan::getPlanCycle, plancycle)
+                .in(AppPlan::getPlanOfOrgId, getHangsheOrgIds()));
 //                .eq(AppPlan::getPlanType, 0)
 //                .notIn(AppPlan::getPlanExec, canteenPlanExec));
         KeyValue<Integer, Integer> yearQuarter = new KeyValue<>(DateUtil.year(dateTime), DateUtil.quarter(dateTime));
@@ -560,7 +565,8 @@ public class ResumptionTaskBusiness {
     public void syncHalfYear(DateTime dateTime, int plancycle) {//plancycle==4
         List<AppPlan> AppPlanList = appPlanService.list((new QueryWrapper<AppPlan>()).lambda()
                 .eq(AppPlan::getPlanStatus, 1)
-                .eq(AppPlan::getPlanCycle, plancycle));
+                .eq(AppPlan::getPlanCycle, plancycle)
+                .in(AppPlan::getPlanOfOrgId, getHangsheOrgIds()));
 //                .eq(AppPlan::getPlanType, 0)
 //                .notIn(AppPlan::getPlanExec, canteenPlanExec));
         DateHelper dateHelper = new DateHelper(dateTime);
@@ -624,7 +630,8 @@ public class ResumptionTaskBusiness {
     public void syncYear(DateTime dateTime, int plancycle) {//plancycle==5
         List<AppPlan> AppPlanList = appPlanService.list((new QueryWrapper<AppPlan>()).lambda()
                 .eq(AppPlan::getPlanStatus, 1)
-                .eq(AppPlan::getPlanCycle, plancycle));
+                .eq(AppPlan::getPlanCycle, plancycle)
+                .in(AppPlan::getPlanOfOrgId, getHangsheOrgIds()));
 //                .eq(AppPlan::getPlanType, 0)
 //                .notIn(AppPlan::getPlanExec, canteenPlanExec));
         DateTime time1 = new DateTime(dateTime);
@@ -734,13 +741,21 @@ public class ResumptionTaskBusiness {
      */
     private List<Long> getPlanOrgIds(AppPlan appPlan) {
         List<Long> orgIds = null;
-        if (appPlan.getExecType()!=null&&appPlan.getExecType() == 0) {//0机构类型需要安类型去机构里查询所以的机构
-            orgIds = orgService.findListByOrgType(appPlan.getExecOrgType(),SecurityConstants.INNER).getData();
-        } else {
-            List<SysOrg> sysOrgs = orgService.selectByOrgType(appPlan.getExecOrgType(), SecurityConstants.INNER);
-             orgIds = sysOrgs.stream().map(SysOrg::getId).collect(Collectors.toList());
-//            orgIds = appPlanService.findExecOrgByPlan(appPlan.getId());
+//        if (appPlan.getExecType()!=null&&appPlan.getExecType() == 0) {//0机构类型需要安类型去机构里查询所以的机构
+        OrgListByTypesConditionEto cond = new OrgListByTypesConditionEto();
+        cond.setOrgId(appPlan.getPlanOfOrgId());
+        cond.setOrgTypes(Arrays.asList(appPlan.getExecOrgType().toString()));
+        R<List<SysOrg>> r = orgService.listByTypes(cond);
+        if (ObjectUtil.isNull(r) || ObjectUtil.isEmpty(r.getData())) {
+            return new ArrayList<>();
         }
+        orgIds = r.getData().stream().map(i -> i.getId()).collect(Collectors.toList());
+//        }
+//        else {
+//            List<SysOrg> sysOrgs = orgService.selectByOrgType(appPlan.getExecOrgType(), SecurityConstants.INNER);
+//             orgIds = sysOrgs.stream().map(SysOrg::getId).collect(Collectors.toList());
+////            orgIds = appPlanService.findExecOrgByPlan(appPlan.getId());
+//        }
 
         return orgIds;
     }
@@ -748,15 +763,22 @@ public class ResumptionTaskBusiness {
     private List<SysOrg> getPlanOrgs(AppPlan appPlan) {
         List<Long> orgIds = null;
         if (appPlan.getExecType() == 0) {//0机构类型需要安类型去机构里查询所以的机构
-            orgIds = orgService.findListByOrgType(appPlan.getExecOrgType(),SecurityConstants.INNER).getData();
+            orgIds = orgService.findListByOrgType(appPlan.getExecOrgType(), SecurityConstants.INNER).getData();
         } else {
             orgIds = appPlanService.findExecOrgByPlan(appPlan.getId());
         }
 
-        return orgService.listByIds(orgIds,SecurityConstants.INNER).getData();
+        return orgService.listByIds(orgIds, SecurityConstants.INNER).getData();
     }
 
+    private List<Long> getHangsheOrgIds() {
+        R<List<Long>> allHangshe = orgService.findListByOrgType(3, SecurityConstants.INNER);
+        if (ObjectUtil.isNull(allHangshe) || ObjectUtil.isEmpty(allHangshe.getData())) {
+            return new ArrayList<>();
+        }
 
+        return allHangshe.getData();
+    }
 
     /**
      * 根据作息变更生成新的每日每小时履职任务
@@ -1270,7 +1292,7 @@ public class ResumptionTaskBusiness {
         //更加计划id获取启用状态的计划
         List<AppPlan> appPlans = getAppPlanByPlanIds(planIds);
         //获取有作息的机构id
-        List<Long> workOrgIds = this.workTimeService.findOrgIdsByYmd(datetime.toString().substring(0, 10),SecurityConstants.INNER).getData();
+        List<Long> workOrgIds = this.workTimeService.findOrgIdsByYmd(datetime.toString().substring(0, 10), SecurityConstants.INNER).getData();
         for (AppPlan plan : appPlans) {
             //获取每个计划要生成任务的机构
             List<Long> orgIdsByPlanListNew = getOrgIdsByPlanIds(plan, orgIds, workOrgIds);
@@ -1315,7 +1337,7 @@ public class ResumptionTaskBusiness {
 
     private void saveResumptionByDay(List<Long> orgIdsByPlanListNew, AppPlan appPlan, List<Long> roleIds, DateTime dateTime) {
         for (Long orgId : orgIdsByPlanListNew) {
-            Ymd ymd=toYmd(dateTime,"DAY");
+            Ymd ymd = toYmd(dateTime, "DAY");
             ymd.setOrgId(orgId);
             ymd.setEnable(true);
             final SysWorkTime workTime = this.workTimeService.findWorkTimeByYmd(ymd).getData();
@@ -1436,7 +1458,7 @@ public class ResumptionTaskBusiness {
 
     private void saveResumptionByHour(List<Long> orgIdsByPlanListNew, AppPlan appPlan, List<Long> roleIds, DateTime dateTime) {
         for (final Long orgId : orgIdsByPlanListNew) {
-            Ymd ymd=toYmd(dateTime,"DAY");
+            Ymd ymd = toYmd(dateTime, "DAY");
             ymd.setOrgId(orgId);
             ymd.setEnable(true);
             final SysWorkTime workTime = this.workTimeService.findWorkTimeByYmd(ymd).getData();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/ResumptionPointVo.java

@@ -41,7 +41,7 @@ public class ResumptionPointVo {
     private Long pointdataid;
     private String resTime;
     private Integer businessType;
-    private Integer submitBy;
+    private Long submitBy;
     private String resremark;
     private Date submitTime;
 //    private List<ResumptionNfcVo> pointnfclist;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appPlan/AppPlanVo.java

@@ -68,11 +68,13 @@ private List<Long> ids;
     /**
      * 执行类型
      */
-    private Integer execType;
+    private Integer execType=0;
     @JsonSerialize(using = ToStringSerializer.class)
     private Integer execOrgType;
     private String count;
-    private String planCreateOrgId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long planCreateOrgId;
+
     private String planCreateOrgName;
     /**
      * 是否下穿

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appPlan/ResumptionPlanPageVo.java

@@ -81,6 +81,11 @@ public class ResumptionPlanPageVo {
     private String planCreateOrgId;
 
     /**
+     * 创建机构类型
+     */
+    private String createOrgType;
+
+    /**
      * 计划所属机构名称
      */
     private String planOfOrgName;

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

@@ -39,7 +39,8 @@
         b.orgId,
         b.orgNames,
         o.name as plan_of_org_name,
-        g.name as plan_create_org_name
+        g.name as plan_create_org_name,
+        g.type as createOrgType
         FROM
         core_resumption_plan a
         LEFT JOIN (

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/ResumptionRecordMapper.xml

@@ -444,12 +444,12 @@
             and id = #{query.planId}
         </if>
         <if test="query.upOrgIds!=null and query.upOrgIds.size>0">
-            and (p.plan_create_org_id in
+            and (plan_create_org_id in
             <foreach collection="query.upOrgIds" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>
-            or p.plan_create_org_id in (select id from sys_org
-            where type in ('1','2','3','4','11') and deleted=0 and path like concat((select path from sys_org where id=#{query.orgId}),'%'))
+            or plan_create_org_id in (select id from sys_org
+            where type in ('1','2','3') and deleted=0 and path like concat((select path from sys_org where id=#{query.orgId}),'%'))
             )
         </if>
     </select>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeptController.java

@@ -169,9 +169,10 @@ public class SysDeptController extends BaseController {
         return R.ok(orgService.listByIds(ids));
     }
 
-    @GetMapping("/findListByOrgType")
-    public R<List<Long>> findListByOrgType(Integer execOrgType) {
-        return R.ok(orgService.findListByOrgType(execOrgType));
+    @PostMapping("/findListByOrgType")
+    public R<List<Long>> findListByOrgType(@RequestBody Integer execOrgType) {
+        List<Long> ids=orgService.findListByOrgType(execOrgType);
+        return R.ok(ids);
     }
 
     @PostMapping("/findListByOrgTypes")

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysOrgController.java

@@ -154,7 +154,7 @@ public class SysOrgController extends BaseController {
      * @return
      */
     @GetMapping("/getUpOrgs/{orgId}")
-    @InnerAuth
+
     public List<Long> getUpOrgs(@PathVariable("orgId") Long orgId) {
         SysOrg org=sysOrgMapper.selectById(orgId);
         if(ObjectUtil.isNull(org)){