Merge branch 'sky_v1' into dev

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsRoleService.java

@@ -289,7 +289,10 @@ public class KwsRoleService {
         if (kwsRoleDao.update(kwsRoleTable) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
         }
-        saveAuthority(reqVo.getId(), reqVo.getDeptIds());
+        if(StringUtils.isNotBlank(reqVo.getDeptIds())){
+            saveAuthority(reqVo.getId(), reqVo.getDeptIds());
+        }
+
 //        List<KwsUser> kwsUsers = kwsUserDao.selectByRoleIds(Collections.singletonList(reqVo.getId()));
 //
 //        //删除以前的角色