gaodd 4 lat temu
rodzic
commit
6640e42525

+ 3 - 2
src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -244,8 +244,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
244 244
         if (!StringUtils.isEmpty(pageParam.getCondition())) {
245 245
             org.json.JSONObject object = new org.json.JSONObject(pageParam.getCondition());
246 246
             if (StringUtils.isNotBlank(object.optString("type"))) {
247
-            	if(object.optString("type").equals("xz")){
248
-            		ew.like("type", "xz");
247
+            	if(object.optString("type").equals("xz") || object.optString("type").equals("sswx")){
248
+            		ew.like("type",object.optString("type"));
249 249
             		ew.eq("result", 1);//取第一条数据
250 250
             	}else{
251 251
             		ew.eq("type", object.optString("type"));
@@ -255,6 +255,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
255 255
                     	ew.eq("result", 1);//取第一条数据
256 256
                     }
257 257
             	}
258
+            	
258 259
             }else{
259 260
             	ew.eq("result", 1);//取第一条数据
260 261
             }