Merge remote-tracking branch 'origin/master'

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/demo/main-home/components/homePage/index.vue

@@ -525,12 +525,12 @@
   :deep(.slick-slide h3) {
     color: #fff;
   }
-  :deep(:where(.css-dev-only-do-not-override-1hajlzy).ant-carousel .slick-dots) {
+  :deep(.ant-carousel .slick-dots) {
     justify-content: end !important;
     bottom: 4px !important;
     right: 5px !important;
   }
-  :deep(:where(.css-dev-only-do-not-override-1hajlzy).ant-carousel .slick-dots li button) {
+  :deep(.ant-carousel .slick-dots li button) {
     width: 8px !important;
     height: 8px !important;
     border-radius: 50% !important; 

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

@@ -98,18 +98,18 @@ export const formSchema: FormSchema[] = [
       ],
     }
   },
-  {
+  // {
-    field: 'relTenantIds',
+  //   field: 'relTenantIds',
-    component: 'JDictSelectTag',
+  //   component: 'JDictSelectTag',
-    label: '租户',
+  //   label: '租户',
-    colProps: { span: 24 },
+  //   colProps: { span: 24 },
-    componentProps:{
+  //   componentProps:{
-      mode:'multiple',
+  //     mode:'multiple',
-      dictCode:'sys_tenant,name,id',
+  //     dictCode:'sys_tenant,name,id',
-      disabled:true
+  //     disabled:true
-    }
+  //   }
-  },
+  // },
-  {
+/*  {
     field: 'post',
     component: 'JDictSelectTag',
     label: '职位',
@@ -117,9 +117,9 @@ export const formSchema: FormSchema[] = [
     componentProps:{
       mode:'multiple',
       dictCode:'sys_position,name,id',
-      disabled:true
+      disabled:false
     }
-  },
+  },*/
   {
     label: '',
     field: 'id',