Browse Source

panelCodes could be null when assignPanel

sunyj 8 years ago
parent
commit
612b1a37a8

+ 2 - 2
kanban-console/src/main/java/com/uas/kanban/controller/PanelController.java

@@ -37,8 +37,8 @@ public class PanelController extends BaseController<Panel> {
      */
     @RequestMapping("/assignPanel")
     @ResponseBody
-    public boolean assignPanel(@NotEmpty("userCode") String userCode, @NotEmpty("panelCodes") String[] panelCodes, HttpServletRequest request) {
-        panelService.assignPanel(userCode, Arrays.asList(panelCodes));
+    public boolean assignPanel(@NotEmpty("userCode") String userCode, String[] panelCodes, HttpServletRequest request) {
+        panelService.assignPanel(userCode, panelCodes == null ? null : Arrays.asList(panelCodes));
         return true;
     }
 

+ 1 - 1
kanban-console/src/main/java/com/uas/kanban/service/PanelService.java

@@ -21,7 +21,7 @@ public interface PanelService {
      * @param panelCodes 面板 code
      * @return 面板实例
      */
-    List<UserPanelRelation> assignPanel(@NotEmpty("userCode") String userCode, @NotEmpty("panelCodes") List<String> panelCodes);
+    List<UserPanelRelation> assignPanel(@NotEmpty("userCode") String userCode, List<String> panelCodes);
 
     /**
      * 获取分配给用户的面板

+ 2 - 1
kanban-console/src/main/java/com/uas/kanban/service/impl/PanelServiceImpl.java

@@ -84,8 +84,9 @@ public class PanelServiceImpl extends BaseService<Panel> implements PanelService
     }
 
     @Override
-    public List<UserPanelRelation> assignPanel(@NotEmpty("userCode") String userCode, @NotEmpty("panelCodes") List<String> panelCodes) {
+    public List<UserPanelRelation> assignPanel(@NotEmpty("userCode") String userCode, List<String> panelCodes) {
         List<UserPanelRelation> userPanelRelations = new ArrayList<>();
+        panelCodes = panelCodes == null ? new ArrayList<String>() : panelCodes;
         for (String panelCode : panelCodes) {
             // 如果已存在用户面板关系,不必再进行关联
             UserPanelRelation userPanelRelation = userPanelRelationDao.findByUserCodeAndPanelCode(userCode, panelCode);