调机修改

src/com/ejweb/core/conf/SecurityPropertyPlaceholderConfigurer.java

@@ -79,7 +79,7 @@ public class SecurityPropertyPlaceholderConfigurer extends PropertyPlaceholderCo
 
     public static void main(String[] args) {
         System.out.println(DES3Utils.encrypt("foctest", CONF_DESC_KEY));
-        System.out.println(DES3Utils.decrypt("fc76fa2b2e10b3d4450d564314a97766", CONF_DESC_KEY));
-        System.out.println(DES3Utils.decrypt("31a63fac8317458d81c034906825749f7c58c30a773c6927", CONF_DESC_KEY));
+        System.out.println(DES3Utils.decrypt("776b3d2f912b12f8", CONF_DESC_KEY));
+        System.out.println(DES3Utils.decrypt("6f2237c231b1464c6474030c906ec914", CONF_DESC_KEY));
     }
 }

src/com/ejweb/modules/verify/api/VerifyFeedbackController.java

@@ -20,6 +20,7 @@ import com.ejweb.modules.verify.entity.VerifyFeedbackEntity;
 import com.ejweb.modules.verify.service.VerifyFeedbackService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -279,6 +280,11 @@ public class VerifyFeedbackController {
         // 通过参数校验
         if (message == null) {
             PageEntity<VerifyFeedbackEntity> list = feedbackService.verifyConditionList(bean);
+            if (list == null || CollectionUtils.isEmpty(list.getList())) {
+                responseBean.setMessage(GConstants.EMPTY);
+                responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
+                return responseBean;
+            }
             responseBean.setData(list);
             return responseBean;
         }