Ver código fonte

修复缺陷

jiawuxian 1 ano atrás
pai
commit
9bc0027af9

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

@@ -205,9 +205,6 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                     if (ObjectUtil.equal(d.getStatus(), 1)) {
                         plan.setPublishTime(now);
                         plan.setEffectiveTime(effectiveTime);
-                    }else{
-                        plan.setPublishTime(null);
-                        plan.setEffectiveTime(null);
                     }
                     plan.setCreateTime(new Date());
                     plan.setId(null);

+ 0 - 3
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -203,9 +203,6 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
                 if (ObjectUtil.equal(d.getStatus(), 1)) {
                     coreSafecheckPlan.setPublishTime(now);
                     coreSafecheckPlan.setEffectiveTime(effectiveTime);
-                } else {
-                    coreSafecheckPlan.setPublishTime(null);
-                    coreSafecheckPlan.setEffectiveTime(null);
                 }
                 //下发所属机构类型
                 coreSafecheckPlan.setPlanOfOrgType(orgService.selectSysOrgById(coreSafecheckPlan.getPlanOfOrgId(), SecurityConstants.INNER).getType());

+ 0 - 1
soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysRoleController.java

@@ -252,7 +252,6 @@ public class SysRoleController extends BaseController {
         return R.ok(roleService.selectRoleNameByUserId(userId));
     }
 
-    @RequiresPermissions("system:role:query")
     @ApiOperation(value = "根据机构类型查询角色")
     @GetMapping(value = "/getRoleByType/{type}")
     public List<SysRole> getRoleByType(@PathVariable(value = "type", required = false) String type) {