diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareSelectionSituationController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareSelectionSituationController.java
index 2cf76df..4c23504 100644
--- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareSelectionSituationController.java
+++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareSelectionSituationController.java
@@ -1,19 +1,17 @@
package com.budwk.app.zhgh.welfare.controller;
+import cn.dev33.satoken.annotation.SaCheckLogin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.annotation.SLog;
import com.budwk.app.base.page.Pagination;
-import com.budwk.app.base.param.PageForm;
import com.budwk.app.base.result.Result;
-import com.budwk.app.base.utils.PageUtil;
-import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.sys.models.Sys_user;
import com.budwk.app.zhgh.welfare.model.WelfareList;
import com.budwk.app.zhgh.welfare.model.WelfareUserSelection;
import com.budwk.app.zhgh.welfare.param.WelfareSelectionSituationPageForm;
import com.budwk.app.zhgh.welfare.service.WelfareListService;
import com.budwk.app.zhgh.welfare.service.WelfareSelectionSituationService;
-import com.budwk.app.zhgh.welfare.service.WelfareSingleService;
import com.budwk.app.zhgh.welfare.service.WelfareStatisticsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -21,8 +19,6 @@ import lombok.extern.slf4j.Slf4j;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
-import org.nutz.dao.Sqls;
-import org.nutz.dao.sql.Sql;
import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
@@ -86,7 +82,7 @@ public class WelfareSelectionSituationController {
@SaCheckPermission("welfare.selection.situation")
public Result confirmSelect(@Param("selections") WelfareUserSelection[] selections, String projectId, String userId) {
int count = dao.count(WelfareList.class, Cnd.where(WelfareList::getProjectId, "=", projectId).and(WelfareList::getUserId, "=", userId));
- if(count==0){
+ if (count == 0) {
return Result.error("此用户没有选择的权限");
}
@@ -109,4 +105,12 @@ public class WelfareSelectionSituationController {
public void exportXlsx(@Valid @Param("pageForm") WelfareSelectionSituationPageForm pageForm, HttpServletResponse response) {
situationService.exportXlsx(pageForm, response);
}
+
+ @At
+ @SaCheckLogin
+ public Result getMobileByUserId(String userId) {
+ Sys_user user = dao.fetch(Sys_user.class, userId);
+ return Result.success().addData(user.getMobile());
+ }
+
}
diff --git a/src/main/resources/static/components/module/userInfo/index.vue b/src/main/resources/static/components/module/userInfo/index.vue
index 680ea68..39a9fa2 100644
--- a/src/main/resources/static/components/module/userInfo/index.vue
+++ b/src/main/resources/static/components/module/userInfo/index.vue
@@ -29,6 +29,10 @@
{{ viewData.retireDate ? $moment(viewData.retireDate).format("YYYY-MM-DD") : null }}
{{ viewData.mobile }}
+
+ {{ viewData.welfareMobile }}
+ 修改
+
{{ viewData.email }}
@@ -62,6 +66,18 @@
{{ viewData.positionLevel }}
{{ viewData.employeeLevel }}
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+