api详细接口修正

fengxiang

2018-08-14 f53830df5296e399a6153a5a7b0f2b94315dd0c1

 src/main/java/com/moral/common/util/ExampleUtil.java

@@ -55,7 +55,7 @@
            }
            if(!StringUtils.isNullOrEmpty(params)){
                params = URLDecoder.decode(params, "UTF-8");
                if (!StringUtils.isNullOrEmpty(params) && params.startsWith("or|")) {
                if (params.startsWith("or|")) {
                    String[] criteria = params.trim().split(OR_SPLIT);
                    for (String criterion : criteria) {
                        // criterion为null或""跳过
@@ -139,7 +139,16 @@
            List<Example.Criteria> criteriaList = example.getOredCriteria();
            if(criteriaList!=null&&criteriaList.size()>0){
                for(Example.Criteria cri : criteriaList){
                    cri.andNotEqualTo("isDelete", Constants.IS_DELETE_TRUE);
                    boolean isHasIsDelete = false;
                    for(Example.Criterion con : cri.getCriteria()){
                          if( con.getCondition().indexOf("is_delete") >-1) {
                              isHasIsDelete = true;
                              break;
                          }
                    }
                    if( !isHasIsDelete) {
                        cri.andNotEqualTo("isDelete", Constants.IS_DELETE_TRUE);
                    }
                }
            }else {
                example.or().andNotEqualTo("isDelete",Constants.IS_DELETE_TRUE);