Merge branch 'master' of http://182.92.169.222:3000/zhc077/zmd_kejiju

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java

@@ -220,11 +220,23 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         // 12 已验收
         //13  已结项
 
-        //财政管理员看到要立项的数据
+        if ("shenbaoren_role".equals(loginUser.getRoleCode())) {
+            queryWrapper.eq("create_by", loginUser.getUsername());
+            queryWrapper.in("project_status", 11);
+        }
+        if ("faren_admin".equals(loginUser.getRoleCode())) {
+            queryWrapper.eq("sys_org_code", loginUser.getOrgCode());
+            queryWrapper.in("project_status", 11);
+        }
+        if ("quxian_admin".equals(loginUser.getRoleCode())) {
+            queryWrapper.likeRight("sys_org_code", loginUser.getOrgCode());
+            queryWrapper.in("project_status", 11);
+        }
+        if ("caizheng_admin".equals(loginUser.getRoleCode())) {
+            queryWrapper.in("project_status", 11);
+        }
         if ("kejiju_admin".equals(loginUser.getRoleCode())) {
             queryWrapper.in("budget_status", 10, 11);
-        } else {
-            queryWrapper.in("project_status", 11);
         }
         IPage<Project> pageList = projectService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -264,12 +276,38 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         // 12 已验收
         //13  已结项
 
-        //财政管理可以看到要验收的数据
+        /*//财政管理可以看到要验收的数据
         if ("kejiju_admin".equals(loginUser.getRoleCode())) {
             queryWrapper.in("project_status", 11, 12);
         } else {
             queryWrapper.in("project_status", 12);
+        }*/
+
+        // 11 已立项
+        // 12 已验收
+        //13  已结项
+
+        if ("shenbaoren_role".equals(loginUser.getRoleCode())) {
+            queryWrapper.eq("create_by", loginUser.getUsername());
+            queryWrapper.in("project_status", 12);
         }
+        if ("faren_admin".equals(loginUser.getRoleCode())) {
+            queryWrapper.eq("sys_org_code", loginUser.getOrgCode());
+            queryWrapper.in("project_status", 12);
+        }
+        if ("quxian_admin".equals(loginUser.getRoleCode())) {
+            queryWrapper.likeRight("sys_org_code", loginUser.getOrgCode());
+            queryWrapper.in("project_status", 12);
+        }
+        if ("caizheng_admin".equals(loginUser.getRoleCode())) {
+            queryWrapper.in("project_status", 12);
+        }
+        if ("kejiju_admin".equals(loginUser.getRoleCode())) {
+            queryWrapper.in("budget_status", 11,12);
+        }
+
+
+
         IPage<Project> pageList = projectService.page(page, queryWrapper);
         return Result.OK(pageList);
     }
@@ -296,12 +334,32 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         // 12 已验收
         //13  已结项
 
-        //财政管理可以看到要验收的数据
+        /*//财政管理可以看到要验收的数据
         if ("kejiju_admin".equals(loginUser.getRoleCode())) {
             queryWrapper.in("project_status", 12, 13);
         } else {
             queryWrapper.in("project_status", 13);
+        }*/
+
+        if ("shenbaoren_role".equals(loginUser.getRoleCode())) {
+            queryWrapper.eq("create_by", loginUser.getUsername());
+            queryWrapper.in("project_status", 13);
         }
+        if ("faren_admin".equals(loginUser.getRoleCode())) {
+            queryWrapper.eq("sys_org_code", loginUser.getOrgCode());
+            queryWrapper.in("project_status", 13);
+        }
+        if ("quxian_admin".equals(loginUser.getRoleCode())) {
+            queryWrapper.likeRight("sys_org_code", loginUser.getOrgCode());
+            queryWrapper.in("project_status", 13);
+        }
+        if ("caizheng_admin".equals(loginUser.getRoleCode())) {
+            queryWrapper.in("project_status", 13);
+        }
+        if ("kejiju_admin".equals(loginUser.getRoleCode())) {
+            queryWrapper.in("budget_status", 12,13);
+        }
+
         IPage<Project> pageList = projectService.page(page, queryWrapper);
         return Result.OK(pageList);
     }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java

@@ -212,7 +212,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 					sysDepart.setOrgCategory("1");
 				} else {
 					//sysDepart.setOrgCategory("2");原来设置为2，暂时设置3
-					sysDepart.setOrgCategory("3");
+					sysDepart.setOrgCategory(departMapper.getDepartById(parentId).getOrgCategory());
 				}
 			}
 			this.save(sysDepart);

jeecgboot-vue3/src/views/system/usersetting/UserSetting.data.ts

@@ -109,7 +109,7 @@ export const formSchema: FormSchema[] = [
   //     disabled:true
   //   }
   // },
-  {
+/*  {
     field: 'post',
     component: 'JDictSelectTag',
     label: '职位',
@@ -119,7 +119,7 @@ export const formSchema: FormSchema[] = [
       dictCode:'sys_position,name,id',
       disabled:false
     }
-  },
+  },*/
   {
     label: '',
     field: 'id',