Merge branch 'mazq-jiekouyouhua-230523' into 'release/v1.2.0'

feature: 角色查询报错修改

See merge request dcuc-tjdsj/auth-service!240

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/bpo/RoleInfoBPO.java

@@ -304,6 +304,11 @@ public class RoleInfoBPO extends BaseBPO<RoleInfo, String> {
 
     public RoleInfo getByAppIdAndCode(String appId, String code) {
         String sql = "SELECT * FROM T_ROLE_INFO WHERE APP_ID = ? AND CODE = ? AND IS_ACTIVE = '1'";
-        return PersistentFactory.getJdbcDao().queryForObject(sql, RoleInfo.class, new Object[]{appId, code});
+        List<RoleInfo> roleInfos = PersistentFactory.getJdbcDao().queryForList(sql, RoleInfo.class, appId, code);
+        if (CollectionUtils.isEmpty(roleInfos)) {
+            return null;
+        } else {
+            return roleInfos.get(0);
+        }
     }
 }