water新版

src/main/java/com/miniframe/bisiness/system/D10018Service.java

@@ -80,37 +80,37 @@ public class D10018Service extends D10018BaseModel implements ExecProcessFlow {
 	}
 
 	private void setCodes(DChecknodeValcode valcode, List<D_D10018_CODES_RECODE> codes) {
-		if(!StringUtil.isEmpty(valcode.getValCode1()));
+		if(!StringUtil.isEmpty(valcode.getValCode1())&&!"".equals(valcode.getValCode1()));
 		{
 			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 			code.setCode(valcode.getValCode1());
 			codes.add(code);
 		}
-		if(!StringUtil.isEmpty(valcode.getValCode2()));
+		if(!StringUtil.isEmpty(valcode.getValCode2())&&!"".equals(valcode.getValCode2()));
 		{
 			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 			code.setCode(valcode.getValCode2());
 			codes.add(code);
 		}
-		if(!StringUtil.isEmpty(valcode.getValCode3()));
+		if(!StringUtil.isEmpty(valcode.getValCode3())&&!"".equals(valcode.getValCode3()));
 		{
 			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 			code.setCode(valcode.getValCode3());
 			codes.add(code);
 		}
-		if(!StringUtil.isEmpty(valcode.getValCode4()));
+		if(!StringUtil.isEmpty(valcode.getValCode4())&&!"".equals(valcode.getValCode4()));
 		{
 			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 			code.setCode(valcode.getValCode4());
 			codes.add(code);
 		}
-		if(!StringUtil.isEmpty(valcode.getValCode5()));
+		if(!StringUtil.isEmpty(valcode.getValCode5())&&!"".equals(valcode.getValCode5()));
 		{
 			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 			code.setCode(valcode.getValCode5());
 			codes.add(code);
 		}
-		if(!StringUtil.isEmpty(valcode.getValCode6()));
+		if(!StringUtil.isEmpty(valcode.getValCode6())&&!"".equals(valcode.getValCode6()));
 		{
 			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 			code.setCode(valcode.getValCode6());

src/main/java/com/miniframe/bisiness/system/D10019Service.java

@@ -70,6 +70,7 @@ public class D10019Service extends D10019BaseModel implements ExecProcessFlow {
 			throw  new BusinessException("EB3100026");
 		}
 		DChecknodeValcode valcode =valcodes.get(0);
+
 		DChecknodeValMapper valMapper =UtilTools.getBean(DChecknodeValMapper.class);
 		DChecknodeValSQLBuilder sb =new DChecknodeValSQLBuilder();
 		DChecknodeValSQLBuilder.Criteria sc = sb.createCriteria();
@@ -77,10 +78,10 @@ public class D10019Service extends D10019BaseModel implements ExecProcessFlow {
 		sc.andJidEqualTo(job.getId());
 		sc.andChnameEqualTo(chname);
 		sb.setOrderByClause("step ASC");
-		List<DChecknodeVal> vals =new ArrayList<>();
+		List<DChecknodeVal> vals = valMapper.selectByExample(sb);
 
 
-		if(!StringUtil.isEmpty(valcode.getValCode1())){
+		if(!StringUtil.isEmpty(valcode.getValCode1())&&!"".equals(valcode.getValCode1())){
 			D_D10019_ROWS_RECODE row =new D_D10019_ROWS_RECODE();
 			row.setCode(valcode.getValCode1());
 			List<D_D10019_ROWS_DATA_RECODE> rowdatas =new ArrayList<>();
@@ -93,7 +94,7 @@ public class D10019Service extends D10019BaseModel implements ExecProcessFlow {
 			rows.add(row);
 		}
 
-		if(!StringUtil.isEmpty(valcode.getValCode2())){
+		if(!StringUtil.isEmpty(valcode.getValCode2())&&!"".equals(valcode.getValCode2())){
 			D_D10019_ROWS_RECODE row =new D_D10019_ROWS_RECODE();
 			row.setCode(valcode.getValCode2());
 			List<D_D10019_ROWS_DATA_RECODE> rowdatas =new ArrayList<>();
@@ -106,7 +107,7 @@ public class D10019Service extends D10019BaseModel implements ExecProcessFlow {
 			rows.add(row);
 		}
 
-		if(!StringUtil.isEmpty(valcode.getValCode3())){
+		if(!StringUtil.isEmpty(valcode.getValCode3())&&!"".equals(valcode.getValCode3())){
 			D_D10019_ROWS_RECODE row =new D_D10019_ROWS_RECODE();
 			row.setCode(valcode.getValCode3());
 			List<D_D10019_ROWS_DATA_RECODE> rowdatas =new ArrayList<>();
@@ -119,7 +120,7 @@ public class D10019Service extends D10019BaseModel implements ExecProcessFlow {
 			rows.add(row);
 		}
 
-		if(!StringUtil.isEmpty(valcode.getValCode4())){
+		if(!StringUtil.isEmpty(valcode.getValCode4())&&!"".equals(valcode.getValCode4())){
 			D_D10019_ROWS_RECODE row =new D_D10019_ROWS_RECODE();
 			row.setCode(valcode.getValCode4());
 			List<D_D10019_ROWS_DATA_RECODE> rowdatas =new ArrayList<>();
@@ -132,7 +133,7 @@ public class D10019Service extends D10019BaseModel implements ExecProcessFlow {
 			rows.add(row);
 		}
 
-		if(!StringUtil.isEmpty(valcode.getValCode5())){
+		if(!StringUtil.isEmpty(valcode.getValCode5())&&!"".equals(valcode.getValCode5())){
 			D_D10019_ROWS_RECODE row =new D_D10019_ROWS_RECODE();
 			row.setCode(valcode.getValCode5());
 			List<D_D10019_ROWS_DATA_RECODE> rowdatas =new ArrayList<>();
@@ -144,7 +145,7 @@ public class D10019Service extends D10019BaseModel implements ExecProcessFlow {
 			row.setData(rowdatas);
 			rows.add(row);
 		}
-		if(!StringUtil.isEmpty(valcode.getValCode6())){
+		if(!StringUtil.isEmpty(valcode.getValCode6())&&!"".equals(valcode.getValCode6())){
 			D_D10019_ROWS_RECODE row =new D_D10019_ROWS_RECODE();
 			row.setCode(valcode.getValCode6());
 			List<D_D10019_ROWS_DATA_RECODE> rowdatas =new ArrayList<>();