|
|
@@ -24,7 +24,7 @@ import org.apache.commons.collections4.CollectionUtils;
|
|
|
@Slf4j
|
|
|
public class JcebQueryUtil {
|
|
|
|
|
|
- private static JcebQueryParamVo getJcebQuery(){
|
|
|
+ private static JcebQueryParamVo getJcebQuery(String submitState){
|
|
|
SysUser user = SecurityUtils.getLoginUser().getUser();
|
|
|
// 管理员全部数据
|
|
|
JcebQueryParamVo jcebQuery = new JcebQueryParamVo();
|
|
|
@@ -65,13 +65,14 @@ public class JcebQueryUtil {
|
|
|
}else {
|
|
|
jcebQuery.setCreateBy(user.getUserName());
|
|
|
jcebQuery.setPostType(PostTypeEnum.STAFF.getCode());
|
|
|
+ jcebQuery.setSubmitState(submitState);
|
|
|
}
|
|
|
return jcebQuery;
|
|
|
}
|
|
|
|
|
|
public static void setBusJceb(BusJceb jceb){
|
|
|
log.info("---- BusJceb.submitState = {}", jceb.getSubmitState());
|
|
|
- JcebQueryParamVo jcebQuery = getJcebQuery();
|
|
|
+ JcebQueryParamVo jcebQuery = getJcebQuery(jceb.getSubmitState());
|
|
|
jceb.setSubmitState(jcebQuery.getSubmitState());
|
|
|
jceb.setDeptId(jcebQuery.getDeptId());
|
|
|
jceb.setCreateBy(jcebQuery.getCreateBy());
|
|
|
@@ -79,14 +80,14 @@ public class JcebQueryUtil {
|
|
|
}
|
|
|
|
|
|
public static void setBusJcab(BusJcab jcab){
|
|
|
- JcebQueryParamVo jcebQuery = getJcebQuery();
|
|
|
+ JcebQueryParamVo jcebQuery = getJcebQuery(jcab.getSubmitState());
|
|
|
jcab.setSubmitState(jcebQuery.getSubmitState());
|
|
|
jcab.setDeptId(jcebQuery.getDeptId());
|
|
|
jcab.setCreateBy(jcebQuery.getCreateBy());
|
|
|
}
|
|
|
|
|
|
public static void setBusJcebQuery(JcebQueryVo query){
|
|
|
- JcebQueryParamVo jcebQuery = getJcebQuery();
|
|
|
+ JcebQueryParamVo jcebQuery = getJcebQuery(query.getSubmitState());
|
|
|
query.setSubmitState(jcebQuery.getSubmitState());
|
|
|
query.setDeptId(jcebQuery.getDeptId());
|
|
|
query.setCreateBy(jcebQuery.getCreateBy());
|