c-hongqw1/zhgh_hhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server_commit

Browse Source
This commit is contained in:
zhaoxinyu
2024-08-28 09:14:20 +08:00
parent b2816d25fc
commit 1f408391f9
13 changed files with 175 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/wakershome/controller/data/WakesHomeDataRevelController.java
+5 -4
View File
@@ -6,6 +6,7 @@ import cn.wizzer.framework.page.Pagination;
import io.v.nutz.annontation.ViReturn;
import io.v.nutz.base.result.Result;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.modules.models.PageForm;
import io.v.nutz.sys.models.Sys_file;
import io.v.nutz.sys.models.Sys_user_role;
@@ -92,11 +93,11 @@ public class WakesHomeDataRevelController {
Cnd cnd = Cnd.NEW();
if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) {
List<Sys_user_role> data = dao.query(Sys_user_role.class, Cnd.where("userId", "=", ShiroUtil.getUserId()).and("roleId", "=", Roles.UNION_MANGER));
List<String> unionIds = data.stream().map(Sys_user_role::getUnionid).distinct().collect(Collectors.toList());
cnd.and("un.id", "in", unionIds);
/* List<Sys_user_role> data = dao.query(Sys_user_role.class, Cnd.where("userId", "=", ShiroUtil.getUserId()).and("roleId", "=", Roles.UNION_MANGER));
List<String> unionIds = data.stream().map(Sys_user_role::getUnionid).distinct().collect(Collectors.toList());*/
cnd.and("un.id", "=", Vi.getUnionId());
}
cnd.and("un.isEnable","=",true);
// cnd.and("un.isEnable","=",true);
cnd.asc("un.unioncode");
sql.setCondition(cnd);
nutMap.setv("child", wakesHomeInfoService.listMap(sql));
src/main/java/io/v/nutz/wakershome/mobile/MWakesHomeReviewController.java
+3 -2
View File
@@ -146,10 +146,11 @@ public class MWakesHomeReviewController {
@At
@ViReturn
@Aop(TransAop.READ_COMMITTED)
public Object doSubmit(WakesHomeVo wakesHomeVo) {
try {
User user = baseService.dao().fetch(User.class, Cnd.where("id", "=", ShiroUtil.getUser()));
User user = baseService.dao().fetch(User.class, Cnd.where("id", "=", ShiroUtil.getUserId()));
CommentPeo peo = new CommentPeo();
if (Strings.isNotBlank(wakesHomeVo.getEvaluatedPersonId())) {
peo.setEvaluatedPersonId(wakesHomeVo.getEvaluatedPersonId());
@@ -181,7 +182,7 @@ public class MWakesHomeReviewController {
return Result.success();
} catch (Exception e) {
e.printStackTrace();
return Result.error();
throw new RuntimeException();
}
}