Преглед изворни кода

数据元加载失败及代办加载失败

guoyuanquan@mail.taiji.com.cn пре 8 месеци
родитељ
комит
4fa872922c

+ 1 - 1
cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/service/DatametaService.java

@@ -150,7 +150,7 @@ public class DatametaService extends BaseService {
 					}
 					if(!(dto.getDescription()!=null && dto.getDescription().length() > 0&&"3".equals(dto.getDescription()) )){
 
-					if(dto.getCreator() !=null&&!flag){
+					if(dto.getCreator() !=null&&!flag&&!flag_bmsh_role&&!flag_zgbmsh_role){
 				        	pl.add(cb.or((cb.equal(root.get("creator") ,dto.getCreator()))));
 				        }}
 					if(!flag&&("2,5".equals(dto.getDescription())||"3,4".equals(dto.getDescription())||dto.getCreator() !=null)){

+ 1 - 1
cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/service/DbdcUserService.java

@@ -874,7 +874,7 @@ public class DbdcUserService {
 			return infolist;
 		} else {
 			if (flag_zgbmsh_role) {
-				Map ty = jdbcTemplate.queryForMap("select count(1) ZS from t_infoclass where disablestate=1 and inprocess='2' and LATESTVERSION='1' and instr(?,xzqhcode)>0", new Object[] {xzqhcodes});
+				Map ty = jdbcTemplate.queryForMap("select count(1) ZS from t_infoclass where disablestate='1' and inprocess='2' and LATESTVERSION='1' and instr(?,xzqhcode)>0", new Object[] {xzqhcodes});
 				Map resultMapa = new HashMap<String, Object>();
 				resultMapa.put("info", "您有<font color=\"red\">" + ty.get("ZS")
 						+ "</font>个信息类停用申请待审任务,请到<a href-name=\"信息类停启\" href-url=\"/tinfoclass/tinfoclass_tqlist\"> <font color=\"green\">数据目录管理->目录规划->信息类管理->信息类停启</font></a> 功能模块进行操作。");

+ 1 - 0
cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/web/DatametaController.java

@@ -147,6 +147,7 @@ public class DatametaController extends BaseAction {
 		User userInfo = (User) session.getAttribute("user");
 		String sjyxc =	request.getParameter("sjyxc");
 		dto.setCreator(userInfo.getUserId());
+		dto.setCreatorOrg(userInfo.getDeptid());
 		if(sjyxc!=null && "1".equals(sjyxc)){
 			model.addAttribute("sjyxc", 1);
 		}else{