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

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);

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());

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

@@ -66,8 +66,15 @@ public class SysDeptController extends BaseController {
      */
     @RequiresPermissions("system:dept:list")
     @GetMapping("/list")
-    public TableDataInfo<SysOrg> list(SysOrg dept) {
-        return orgService.selectPage(dept);
+    public AjaxResult list(SysOrg dept) {
+        AjaxResult ajaxResult = AjaxResult.success();
+        ajaxResult.put(AjaxResult.DATA_TAG, orgService.selectPage(dept));
+        boolean isEdit = false;
+        if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+            isEdit = true;
+        }
+        ajaxResult.put("isEdit", isEdit);
+        return ajaxResult;
     }
 
     @RequiresPermissions("system:dept:exportConstructionDetails")
@@ -100,6 +107,7 @@ public class SysDeptController extends BaseController {
             response.setCharacterEncoding("utf-8");
         }
     }
+
     @RequiresPermissions("system:dept:exportSecurityWork")
     @PostMapping("/exportSecurityWork")
     public void exportSecurityWork(SysOrg dept, HttpServletResponse response) {
@@ -129,6 +137,7 @@ public class SysDeptController extends BaseController {
             response.setCharacterEncoding("utf-8");
         }
     }
+
     @RequiresPermissions("system:dept:exportConstruction")
     @PostMapping("/exportConstruction")
     public void exportConstruction(SysOrg dept, HttpServletResponse response) {

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) {