diff --git a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/StringUtils.java b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/StringUtils.java index 0ec6ba16..4bfca7da 100644 --- a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/StringUtils.java +++ b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/StringUtils.java @@ -717,7 +717,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils */ public static int getAgeFromIdCard(String idCard) { if (idCard == null || idCard.length() != 18) { - throw new IllegalArgumentException("身份证号码无效!"); + return 0; } // 提取出生日期(身份证号的第7到第14位) String birthDateStr = idCard.substring(6, 14); diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java index b200f6cf..0d903daa 100644 --- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java @@ -180,7 +180,13 @@ public class FlowBusinessKeyController extends BaseController { flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId())); }else{ flowTaskEntity.setAssigneeId(SecurityUtils.getUserId()); - flowTaskEntity.setRoleIds(Arrays.asList(SecurityUtils.getLoginUser().getSysUser().getRoleIds())); + if(loginUser.getSysUser().getRoles().size()>0){ + flowTaskEntity.setRoleIds(loginUser.getSysUser().getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList())); + }else{ + List roleIds = new ArrayList<>(); + roleIds.add(0L); + flowTaskEntity.setRoleIds(roleIds); + } } startPage(); return getDataTable(flowBusinessKeyService.selectMyAwaitFlowTask(flowTaskEntity)); diff --git a/yanzhu-ui-vue3/src/views/flowable/task/myProcess/detail/indexDrawer.vue b/yanzhu-ui-vue3/src/views/flowable/task/myProcess/detail/indexDrawer.vue index fbf123cc..5cdec0a0 100644 --- a/yanzhu-ui-vue3/src/views/flowable/task/myProcess/detail/indexDrawer.vue +++ b/yanzhu-ui-vue3/src/views/flowable/task/myProcess/detail/indexDrawer.vue @@ -138,20 +138,54 @@ - - + + - + - + - {{ initData.user.nickName }} {{ initData.user.cardCode }} + {{ initData.userName }} {{ initData.cardCode }} + + + {{ initData.userName }} {{ initData.cardCode }} + + + {{ initData.craftPostName }} + + + {{ initData.subDeptGroupName }} + + + {{ initData.userInfos.nativePlace }} + + + {{ initData.userInfos.address }} + + + + + + + + + + {{ initData.userInfos.emergencyContact }} {{ initData.userInfos.contactPhone }} + + + {{ initData.userInfos.bankName }} + + + {{ initData.userInfos.bankName }} + + + {{ initData.userInfos.bankName }} - {{ initData.user.userName }} + {{ initData.userPhone }} {{ initData.degreeGradeName }} @@ -446,8 +480,8 @@ let category = parseInt(dataOptions.value.category); if(category==1 || category==2 || category==3 || category==4){ getProProjectInfoSubdeptsUsers(dataOptions.value.businessKey).then(res =>{ - if(res.data.user.userInfos){ - res.data.user.userInfos = JSON.parse(res.data.user.userInfos); + if(res.data.userInfos){ + res.data.userInfos = JSON.parse(res.data.userInfos); } initData.value = res.data ; getProProjectInfoSubdepts(res.data.subDeptId).then(parRes =>{ diff --git a/yanzhu-ui-vue3/src/views/flowable/task/todo/detail/indexDrawer.vue b/yanzhu-ui-vue3/src/views/flowable/task/todo/detail/indexDrawer.vue index f04274bf..9643a980 100644 --- a/yanzhu-ui-vue3/src/views/flowable/task/todo/detail/indexDrawer.vue +++ b/yanzhu-ui-vue3/src/views/flowable/task/todo/detail/indexDrawer.vue @@ -138,20 +138,20 @@ - - + + - + - + - {{ initData.user.nickName }} {{ initData.user.cardCode }} + {{ initData.userName }} {{ initData.cardCode }} - {{ initData.user.nickName }} {{ initData.user.cardCode }} + {{ initData.userName }} {{ initData.cardCode }} {{ initData.craftPostName }} @@ -160,32 +160,32 @@ {{ initData.subDeptGroupName }} - {{ initData.user.userInfos.nativePlace }} + {{ initData.userInfos.nativePlace }} - {{ initData.user.userInfos.address }} + {{ initData.userInfos.address }} - - + + - + - {{ initData.user.userInfos.emergencyContact }} {{ initData.user.contactPhone }} + {{ initData.userInfos.emergencyContact }} {{ initData.userInfos.contactPhone }} - {{ initData.user.userInfos.bankName }} + {{ initData.userInfos.bankName }} - {{ initData.user.userInfos.bankName }} + {{ initData.userInfos.bankName }} - {{ initData.user.userInfos.bankName }} + {{ initData.userInfos.bankName }} - {{ initData.user.userName }} + {{ initData.userPhone }} {{ initData.degreeGradeName }} @@ -623,8 +623,8 @@ let category = parseInt(dataOptions.value.category); if(category==1 || category==2 || category==3 || category==4){ getProProjectInfoSubdeptsUsers(dataOptions.value.businessKey).then(res =>{ - if(res.data.user.userInfos){ - res.data.user.userInfos = JSON.parse(res.data.user.userInfos); + if(res.data.userInfos){ + res.data.userInfos = JSON.parse(res.data.userInfos); } initData.value = res.data ; getProProjectInfoSubdepts(res.data.subDeptId).then(parRes =>{