|
|
@@ -29,7 +29,7 @@ public class JcebQueryUtil {
|
|
|
jcebQuery.setSubmitState(submitState);
|
|
|
SysUser user = SecurityUtils.getLoginUser().getUser();
|
|
|
if(JcebStatusEnum.UNREPORTED.getCode().equals(submitState)){
|
|
|
- jcebQuery.setCreateBy(user.getUserName());
|
|
|
+ jcebQuery.setCreateBy(String.valueOf(user.getUserId()));
|
|
|
}else {
|
|
|
jcebQuery.setCreateBy(null);
|
|
|
}
|
|
|
@@ -56,7 +56,7 @@ public class JcebQueryUtil {
|
|
|
log.debug("^_^ postType = {} ^_^", postType);
|
|
|
if(PostTypeEnum.CENTER == postType) {
|
|
|
log.debug("^_^ 中心领导根据选择的车间查询 ^_^");
|
|
|
- jcebQuery.setDeptId(getDeptIdCache(user.getUserId()));
|
|
|
+ // jcebQuery.setDeptId(getDeptIdCache(user.getUserId()))
|
|
|
jcebQuery.setPostType(PostTypeEnum.CENTER.getCode());
|
|
|
}else if(PostTypeEnum.LEADER == postType || scope.equals(DataScopeAspect.DATA_SCOPE_DEPT)
|
|
|
|| scope.equals(DataScopeAspect.DATA_SCOPE_DEPT_AND_CHILD)){
|
|
|
@@ -65,7 +65,7 @@ public class JcebQueryUtil {
|
|
|
jcebQuery.setPostType(PostTypeEnum.LEADER.getCode());
|
|
|
}else {
|
|
|
log.debug("^_^ 车间职工只能查看自己的 ^_^");
|
|
|
- jcebQuery.setCreateBy(user.getUserName());
|
|
|
+ jcebQuery.setCreateBy(String.valueOf(user.getUserId()));
|
|
|
jcebQuery.setPostType(PostTypeEnum.STAFF.getCode());
|
|
|
}
|
|
|
return jcebQuery;
|