Merge remote-tracking branch 'origin/master'

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

@@ -124,7 +124,7 @@ public class ProjectController extends JeecgController<Project, IProjectService>
     /**
      * @description: 申报列表，不同角色可见数据
      * @param: [project, pageNo, pageSize, req]
-     * @return: org.jeecg.common.api.vo.Result<com.baomidou.mybatisplus.core.metadata.IPage<org.jeecg.modules.demo.project.entity.Project>>
+     * @return: org.jeecg.common.api.vo.Result<com.baomidou.mybatisplus.core.metadata.IPage < org.jeecg.modules.demo.project.entity.Project>>
      * @author: z.h.c
      * @date: 24/11/7 14:56
      */
@@ -303,11 +303,10 @@ public class ProjectController extends JeecgController<Project, IProjectService>
             queryWrapper.in("project_status", 12);
         }
         if ("kejiju_admin".equals(loginUser.getRoleCode())) {
-            queryWrapper.in("budget_status", 11,12);
+            queryWrapper.in("budget_status", 11, 12);
         }
 
 
-
         IPage<Project> pageList = projectService.page(page, queryWrapper);
         return Result.OK(pageList);
     }
@@ -357,7 +356,7 @@ public class ProjectController extends JeecgController<Project, IProjectService>
             queryWrapper.in("project_status", 13);
         }
         if ("kejiju_admin".equals(loginUser.getRoleCode())) {
-            queryWrapper.in("budget_status", 12,13);
+            queryWrapper.in("budget_status", 12, 13);
         }
 
         IPage<Project> pageList = projectService.page(page, queryWrapper);
@@ -420,7 +419,7 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         ProjectType projectType = iProjectTypeService.getById(project.getProjectTypeid());
         project.setAnnualName(projectType.getAnnualName());
         project.setProjectTypeName(projectType.getTypeName());
-        SysDepart sysDepart = iSysDepartService.getById(project.getSysOrgCode());
+        SysDepart sysDepart = iSysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getOrgCode,project.getSysOrgCode()));
         project.setDepartName(sysDepart.getDepartName());
         SysUser sysUser = iSysUserService.getById(project.getProjectCharger());
         project.setProjectCharger(sysUser.getRealname());
@@ -434,7 +433,8 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         ProjectType projectType = iProjectTypeService.getById(project.getProjectTypeid());
         project.setAnnualName(projectType.getAnnualName());
         project.setProjectTypeName(projectType.getTypeName());
-        SysDepart sysDepart = iSysDepartService.getById(project.getSysOrgCode());
+//        SysDepart sysDepart = iSysDepartService.getById(project.getSysOrgCode());
+        SysDepart sysDepart = iSysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getOrgCode,project.getSysOrgCode()));
         project.setDepartName(sysDepart.getDepartName());
         SysUser sysUser = iSysUserService.getById(project.getProjectCharger());
         project.setProjectCharger(sysUser.getRealname());
@@ -522,8 +522,12 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         Depadminlx depadminlx = iDepadminlxService.getOne(new LambdaQueryWrapper<Depadminlx>().eq(Depadminlx::getDepid, project.getSysOrgCode()));
         DepartExtDto2 dto = new DepartExtDto2();
         BeanUtils.copyProperties(sysDepart, dto);
+        if (ObjectUtil.isNotEmpty(departExt)) {
             BeanUtils.copyProperties(departExt, dto);
+        }
+        if (ObjectUtil.isNotEmpty(depadminlx)) {
             BeanUtils.copyProperties(depadminlx, dto);
+        }
         ProjectType projectType = iProjectTypeService.getById(project.getProjectTypeid());
         dto.setAnnualName(projectType.getAnnualName());
         List<DictModel> dictModels = sysBaseApi.queryDictItemsByCode("depart_type");

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/service/impl/ProjectServiceImpl.java

@@ -106,7 +106,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         BeanUtils.copyProperties(dto, sysDepart);
         BeanUtils.copyProperties(dto, userExt);
         BeanUtils.copyProperties(dto, project);
-        project.setSysOrgCode(loginUser.getOrgId());
+        project.setSysOrgCode(loginUser.getOrgCode());
         this.updateById(project);
 
         userExt.setUserId(loginUser.getId());

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/controller/ProjectAnnualBudgetController.java

@@ -154,9 +154,9 @@ public class ProjectAnnualBudgetController extends JeecgController<ProjectAnnual
     @GetMapping(value = "/queryByProjectId/{projectId}")
     public Result<ProjectAnnualBudget> queryByProjectId(@PathVariable("projectId") String projectId) {
         ProjectAnnualBudget projectAnnualBudget = projectAnnualBudgetService.getOne(new LambdaQueryWrapper<ProjectAnnualBudget>().eq(ProjectAnnualBudget::getProjectId,projectId));
-        if (projectAnnualBudget == null) {
+        /*if (projectAnnualBudget == null) {
-            return Result.error("未找到对应数据");
+            return Result.error("暂无数据");
-        }
+        }*/
         return Result.OK(projectAnnualBudget);
     }
 

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -2024,6 +2024,7 @@ public class SysUserController {
             user.setSalt(salt);
             user.setUsername(username);
             user.setWorkNo(workon);
+            user.setOrgCode(depart.getOrgCode());
             user.setRealname(realname);
             user.setPassword(passwordEncode);
             //user.setEmail(email);

jeecgboot-vue3/src/views/demo/main-home/components/instrumentSharing/index.vue

@@ -4,8 +4,8 @@
       <div class="item">
         <div class="left">仪器类别</div>
         <div class="right">
-          <div>通用</div>
+          <div :class=" allIndex === 1 ? 'avtive' : ''" @click="searchByKeywords(0)">通用</div>
-          <div>专用</div>
+          <div :class=" allIndex === 2 ? 'avtive' : ''" @click="searchByKeywords(1)">专用</div>
         </div>
       </div>
       <div class="item">
@@ -181,6 +181,12 @@
       },
     });
   }
+  const allIndex = ref(0)
+  const searchByKeywords = (type) => {
+    allIndex.value = type + 1
+    page.value.type = type;
+    getindexcompEvent();
+  }
 </script>
 
 <style scoped lang="less">

jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue

@@ -212,8 +212,8 @@
   //账号登录表单字段
   const formData = reactive<any>({
     inputCode: '',
-    username: 'admin',
+    username: '',
-    password: '123456',
+    password: '',
   });
   //手机登录表单字段
   const phoneFormData = reactive<any>({

jeecgboot-vue3/src/views/system/usersetting/BaseSetting.vue

@@ -39,10 +39,10 @@
           <span class="gray-75 item-label">性别</span>
           <span class="gray-3">{{ userInfo.sexText }}</span>
         </div>
-        <div class="margin-bottom-10 nowarp font-size-13">
+<!--        <div class="margin-bottom-10 nowarp font-size-13">-->
-          <span class="gray-75 item-label">职位</span>
+<!--          <span class="gray-75 item-label">职位</span>-->
-          <span class="gray-3">{{ userInfo.postText ? userInfo.postText : "未填写" }}</span>
+<!--          <span class="gray-3">{{ userInfo.postText ? userInfo.postText : "未填写" }}</span>-->
-        </div>
+<!--        </div>-->
         <div class="font-size-13">
           <span class="item-label"></span>
           <span class="item-label pointer" style="color:#1e88e5" @click="openEditModal">编辑</span>