规范返回值

gjjs-bd-business/src/main/java/com/ceb/gjjs/mda/resource/base/AbstractCommonResource.java

@@ -178,9 +178,11 @@ public abstract class AbstractCommonResource<V extends BaseVO> {
         String[] ruleArr = new String[]{rule};
         ResponseSet responseSet = getCommonService().executeRule(baseVO, ruleArr);
         Object data = responseSet.getData();
-        ReflectUtil.setValue2RespondVo(t, respondVoClass, data, baseVO.getClass());
-        setTotal(t, baseVO);
-        responseSet.setData(t);
+        if (data != null) {
+            ReflectUtil.setValue2RespondVo(t, respondVoClass, data, baseVO.getClass());
+            setTotal(t, baseVO);
+            responseSet.setData(t);
+        }
         return responseSet;
     }
 
@@ -203,9 +205,11 @@ public abstract class AbstractCommonResource<V extends BaseVO> {
         String[] ruleArr = new String[]{rule};
         ResponseSet responseSet = getCommonService().executeCheck(baseVO, ruleArr);
         Object data = responseSet.getData();
-        ReflectUtil.setValue2RespondVo(t, respondVoClass, data, baseVO.getClass());
-        setTotal(t, baseVO);
-        responseSet.setData(t);
+        if (data != null) {
+            ReflectUtil.setValue2RespondVo(t, respondVoClass, data, baseVO.getClass());
+            setTotal(t, baseVO);
+            responseSet.setData(t);
+        }
         return responseSet;
     }
 
@@ -290,7 +294,8 @@ public abstract class AbstractCommonResource<V extends BaseVO> {
      */
     private void setTotal(Object t, BaseVO baseVO) {
         Long total = baseVO.getTotal();
-        if (total != null) {
+
+        if (total != null && baseVO.getPageNum() != 0) {
             Class<?> superclass = t.getClass().getSuperclass();
             Field totalField = null;
             try {

gjjs-bd-runtime/src/main/java/com/brilliance/mda/runtime/response/ResponseSet.java

@@ -53,8 +53,13 @@ public class ResponseSet<T> {
     }
 
     public ResponseSet(String errCode, String errMsg) {
-        this.retcod = errCode;
-        this.retmsg = errMsg;
+        if (CODE_SUCCESS.equals(errCode)) {
+            this.retcod = CODE_SUCCESS;
+            this.retmsg = CODE_SUCCESS;
+        } else {
+            this.retcod = CODE_FAILURE;
+            this.retmsg = CODE_FAILURE;
+        }
         if (MdaEnv.getContext() != null) {
             MdaEnv.getContext().visitValues();
         }
@@ -62,9 +67,11 @@ public class ResponseSet<T> {
 
     public ResponseSet(String errCode, String errMsg, T t) {
         this(errCode, errMsg);
-        this.data = t;
+        if (CODE_SUCCESS.equals(errCode)) {
+            this.data = t;
+        }
         if (t != null && MdaEnv.getContext() != null) {
-            MdaDriver.setValueToVO(MdaEnv.getContext(), this.data);
+            MdaDriver.setValueToVO(MdaEnv.getContext(), t);
         }
     }
 
@@ -102,7 +109,7 @@ public class ResponseSet<T> {
 
 
     public static ResponseSet fail(String message) {
-        ResponseSet responseSet = new ResponseSet(CODE_FAILURE, message);
+        ResponseSet responseSet = new ResponseSet(CODE_FAILURE, CODE_FAILURE);
         return responseSet;
     }