yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java

@@ -179,10 +179,16 @@ public class FlowBusinessKeyController extends BaseController {
             }
         }else{
             if(SecurityUtils.isAdmin(loginUser.getUserid())){
+                // 超管查询所有申请...
+                if(Objects.nonNull(projectId)){
+                    flowTaskEntity.setStartComId(Convert.toStr(projectId));
+                }
                 if(Objects.nonNull(projectId)){
                     flowTaskEntity.setStartProId(Convert.toStr(projectId));
                 }
             }else if(SecurityUtils.isGSAdmin()){
+                // 公司管理员查询公司内的所有申请...
+                flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId()));
                 if(Objects.nonNull(projectId)){
                     flowTaskEntity.setStartProId(Convert.toStr(projectId));
                 }
@@ -214,7 +220,7 @@ public class FlowBusinessKeyController extends BaseController {
         startPage();
         flowTaskEntity.setAssigneeId(SecurityUtils.getUserId());
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        Long projectId = loginUser.getSysUser().getActiveProjectId();
+        Long projectId=loginUser.getSysUser().getActiveProjectId();
         flowTaskEntity.setStartProId(Convert.toStr(projectId));
         return getDataTable(flowBusinessKeyService.selectMyFinishedFlowTask(flowTaskEntity));
     }

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java

@@ -1481,15 +1481,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
         dataMap.put("fProName",proSubdeptsUser.getProjectName());
         dataMap.put("fSubDeptName",proSubdeptsUser.getSubDeptName());
         dataMap.put("fName",proSubdeptsUser.getUserName());
-        if(StringUtils.eqObj("男",proSubdeptsUser.getUserSex()) || StringUtils.eqObj("女",proSubdeptsUser.getUserSex())){
         dataMap.put("fSex",proSubdeptsUser.getUserSex());
-        }else{
-            if(StringUtils.eqObj("0",proSubdeptsUser.getUserSex())){
-                dataMap.put("fSex","男");
-            }else{
-                dataMap.put("fSex","女");
-            }
-        }
         dataMap.put("fAge",StringUtils.getAgeFromIdCard(proSubdeptsUser.getCardCode()));
         dataMap.put("fCode",proSubdeptsUser.getCardCode());
         dataMap.put("fIllnessStatus",Objects.equals(ShiFouEnums.FOU.getCode(),proSubdeptsUser.getIllnessStatus())?"无":"有");

yanzhu-ui-vue3/src/components/flow/User/index.vue

@@ -28,14 +28,7 @@
       </el-col>
       <!--用户数据-->
       <el-col :span="18" :xs="24">
-        <el-form
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" style="margin-bottom: 20px">
-          :model="queryParams"
-          ref="queryForm"
-          :inline="true"
-          v-show="showSearch"
-          label-width="68px"
-          style="margin-bottom: 20px"
-        >
           <el-form-item label="用户名称" prop="userName">
             <el-input
               v-model="queryParams.userName"
@@ -45,127 +38,45 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <!--          <el-form-item label="手机号码" prop="phonenumber">-->
+<!--          <el-form-item label="手机号码" prop="phonenumber">-->
-          <!--            <el-input-->
+<!--            <el-input-->
-          <!--              v-model="queryParams.phonenumber"-->
+<!--              v-model="queryParams.phonenumber"-->
-          <!--              placeholder="请输入手机号码"-->
+<!--              placeholder="请输入手机号码"-->
-          <!--              clearable-->
+<!--              clearable-->
-          <!--              style="width: 150px"-->
+<!--              style="width: 150px"-->
-          <!--              @keyup.enter="handleQuery"-->
+<!--              @keyup.enter="handleQuery"-->
-          <!--            />-->
+<!--            />-->
-          <!--          </el-form-item>-->
+<!--          </el-form-item>-->
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-        <el-table
+        <el-table v-show="checkType === 'multiple'" ref="dataTable" v-loading="loading" :row-key="getRowKey" :data="userList" @selection-change="handleMultipleUserSelect">
-          v-show="checkType === 'multiple'"
+          <el-table-column type="selection" width="50" align="center" reserve-selection/>
-          ref="dataTable"
+          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          v-loading="loading"
+          <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          :row-key="getRowKey"
+          <el-table-column label="用户姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          :data="userList"
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          @selection-change="handleMultipleUserSelect"
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-        >
-          <el-table-column type="selection" width="50" align="center" reserve-selection />
-          <el-table-column
-            label="用户编号"
-            align="center"
-            key="userId"
-            prop="userId"
-            v-if="columns[0].visible"
-          />
-          <el-table-column
-            label="登录账号"
-            align="center"
-            key="userName"
-            prop="userName"
-            v-if="columns[1].visible"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="用户姓名"
-            align="center"
-            key="nickName"
-            prop="nickName"
-            v-if="columns[2].visible"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="部门"
-            align="center"
-            key="deptName"
-            prop="dept.deptName"
-            v-if="columns[3].visible"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="手机号码"
-            align="center"
-            key="phonenumber"
-            prop="phonenumber"
-            v-if="columns[4].visible"
-            width="120"
-          />
         </el-table>
-        <el-table
+        <el-table v-show="checkType === 'single'" v-loading="loading" :data="userList" @current-change="handleSingleUserSelect">
-          v-show="checkType === 'single'"
+          <el-table-column  width="55" align="center" >
-          v-loading="loading"
-          :data="userList"
-          @current-change="handleSingleUserSelect"
-        >
-          <el-table-column width="55" align="center">
             <template #default="scope">
-              <el-radio v-model="radioSelected" :label="scope.row.userId">{{
+              <el-radio v-model="radioSelected" :label="scope.row.userId">{{''}}</el-radio>
-                ""
-              }}</el-radio>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-            label="用户编号"
+          <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-            align="center"
+          <el-table-column label="用户姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-            key="userId"
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-            prop="userId"
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-            v-if="columns[0].visible"
-          />
-          <el-table-column
-            label="登录账号"
-            align="center"
-            key="userName"
-            prop="userName"
-            v-if="columns[1].visible"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="用户姓名"
-            align="center"
-            key="nickName"
-            prop="nickName"
-            v-if="columns[2].visible"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="部门"
-            align="center"
-            key="deptName"
-            prop="dept.deptName"
-            v-if="columns[3].visible"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="手机号码"
-            align="center"
-            key="phonenumber"
-            prop="phonenumber"
-            v-if="columns[4].visible"
-            width="120"
-          />
         </el-table>
 
         <pagination
-          v-show="total > 0"
+            v-show="total>0"
             :total="total"
-          :page-sizes="[5, 10]"
+            :page-sizes="[5,10]"
             layout="prev, pager, next"
             v-model:page="queryParams.pageNum"
             v-model:limit="queryParams.pageSize"
@@ -178,14 +89,11 @@
 
 <script setup name="FlowUser">
 import { listUser, deptTreeSelect } from "@/api/system/user";
-import { markRaw } from "@vue/reactivity";
+import {markRaw} from "@vue/reactivity";
 
 const router = useRouter();
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable, sys_user_sex } = proxy.useDict(
+const { sys_normal_disable, sys_user_sex } = proxy.useDict("sys_normal_disable", "sys_user_sex");
-  "sys_normal_disable",
-  "sys_user_sex"
-);
 
 const userList = ref([]);
 const open = ref(false);
@@ -202,16 +110,6 @@ const deptOptions = ref(undefined);
 const radioSelected = ref(null);
 // 回显数据传值
 const selectUserList = ref([]);
-const defaultProps = ref({
-  children: "children",
-  label: "name",
-});
-
-const checkType = ref({
-  type: String,
-  default: "multiple",
-  required: true,
-});
 
 // 列显隐信息
 const columns = ref([
@@ -221,7 +119,7 @@ const columns = ref([
   { key: 3, label: `部门`, visible: true },
   { key: 4, label: `手机号码`, visible: true },
   { key: 5, label: `状态`, visible: true },
-  { key: 6, label: `创建时间`, visible: true },
+  { key: 6, label: `创建时间`, visible: true }
 ]);
 
 const data = reactive({
@@ -231,21 +129,27 @@ const data = reactive({
     userName: undefined,
     phonenumber: undefined,
     status: undefined,
-    deptId: undefined,
+    deptId: undefined
   },
 });
 
 const { queryParams } = toRefs(data);
 
-const emit = defineEmits(["handleUserSelect"]);
+const emit = defineEmits(['handleUserSelect'])
 
 /** 组件传值  */
 const props = defineProps({
   // 回显数据传值
   selectValues: {
-    type: [Number, String, Array],
+    type: [Number , String , Array],
     default: null,
-    required: false,
+    required: false
+  },
+  // 表格类型
+  checkType: {
+    type: String,
+    default: 'multiple',
+    required: true
   },
 });
 
@@ -255,59 +159,56 @@ const filterNode = (value, data) => {
   return data.label.indexOf(value) !== -1;
 };
 /** 根据名称筛选部门树 */
-watch(deptName, (val) => {
+watch(deptName, val => {
   proxy.$refs["deptTreeRef"].filter(val);
 });
 
 /** 传值监听 */
-watch(
+watch(() => props.selectValues, newValue => {
-  () => props.selectValues,
-  (newValue) => {
       if (newValue) {
-      if (typeof newValue === "number") {
+        if (typeof newValue === 'number') {
-        radioSelected.value = newValue;
+          radioSelected.value = newValue
         } else {
           selectUserList.value = newValue;
         }
       }
-  },
+    }, {immediate: true}
-  { immediate: true }
 );
 
-watch(userList, (newValue) => {
+watch(userList, newValue => {
       if (newValue.length > 0) {
         proxy.$nextTick(() => {
           proxy.$refs.dataTable.clearSelection();
-      selectUserList.value.forEach((key) => {
+          selectUserList.value.forEach(key => {
-        proxy.$refs.dataTable.toggleRowSelection(
+            proxy.$refs.dataTable.toggleRowSelection(userList.value.find(
-          userList.value.find((item) => key === item.userId),
+                item => key === item.userId
-          true
+            ), true)
-        );
           });
         });
       }
-});
+    }
+);
 
 /** 查询部门下拉树结构 */
 function getDeptTree() {
-  deptTreeSelect().then((response) => {
+  deptTreeSelect().then(response => {
     deptOptions.value = response.data;
   });
-}
+};
 
 /** 查询用户列表 */
 function getList() {
   loading.value = true;
-  listUser(queryParams.value).then((res) => {
+  listUser(queryParams.value).then(res => {
     loading.value = false;
     userList.value = res.rows;
     total.value = res.total;
   });
-}
+};
 
 /** 保存选中的数据id,row-key就是要指定一个key标识这一行的数据 */
-function getRowKey(row) {
+function getRowKey (row) {
-  return row.userId;
+  return row.userId
 }
 
 /** 节点单击事件 */
@@ -332,16 +233,17 @@ function resetQuery() {
 
 /** 多选框选中数据 */
 function handleMultipleUserSelect(selection) {
-  emit("handleUserSelect", markRaw(selection));
+  emit('handleUserSelect', markRaw(selection));
 }
 
 /** 单选框选中数据 */
 function handleSingleUserSelect(selection) {
   // 点击当前行时,radio同样有选中效果
   radioSelected.value = selection.userId;
-  emit("handleUserSelect", markRaw(selection));
+  emit('handleUserSelect', markRaw(selection));
 }
 
 getDeptTree();
 getList();
 </script>
+

yanzhu-ui-vue3/src/views/flowable/task/todo/detail/indexDrawer.vue

@@ -150,9 +150,6 @@
                         <el-form-item label="委托人姓名" v-if="dataOptions.category=='1'">
                             {{ initData.userName }} <el-tag type="info">{{ initData.cardCode }}</el-tag>
                         </el-form-item>
-                        <el-form-item label="分包单位" v-if="dataOptions.category != '1'">
-                          {{ initData.subDeptName }}
-                        </el-form-item>
                         <el-form-item label="人员姓名" v-if="dataOptions.category!='1'">
                             {{ initData.userName }} <el-tag type="info">{{ initData.cardCode }}</el-tag>
                         </el-form-item>