feat(user-role): 添加角色创建来源标识功能

- 在 UserRoleAddEntity 中新增 isSysCreate 字段用于标识创建来源
- 区分商户用户和系统用户创建的角色，设置不同的 isSysCreate 值
- 修改数据访问层方法名从 findAllByMerchantId 到 findAllByMerchantIdAndIsSysCreate
- 更新服务层查询逻辑，根据 isSysCreate 条件过滤商户角色列表
- 在 UserRoleTable 实体中添加 isSysCreate 字段定义和注释说明

uacrd-manager-server/src/main/java/com/crm/manager/controller/UserRoleController.java

@@ -52,7 +52,12 @@ public class UserRoleController extends BaseLoginController {
 
         String roleCode = getRoleCode(userRoleAddEntity.getDepartmentId());
         if(userRoleAddEntity.getMerchantId() == null){
+            // 当前人是商户用户
             userRoleAddEntity.setMerchantId(infoEntity.getIbInfo().getMerchantId());
+            userRoleAddEntity.setIsSysCreate(0);
+        }else {
+            // 当前人是系统用户创建的角色
+            userRoleAddEntity.setIsSysCreate(1);
         }
         userRoleAddEntity.setCode(roleCode);
         roleInfoService.addRoleInfo(userRoleAddEntity);

uacrd-manager-server/src/main/java/com/crm/manager/dao/repository/UserRoleRepository.java

@@ -46,5 +46,5 @@ public interface UserRoleRepository extends BaseRepository<UserRoleTable> {
 
     UserRoleTable getFirstByCode(String code);
 
-    List<UserRoleTable> findAllByMerchantId(Integer merchantId);
+    List<UserRoleTable> findAllByMerchantIdAndIsSysCreate(Integer merchantId, Integer isSysCreate);
 }

uacrd-manager-server/src/main/java/com/crm/manager/service/impl/UserRoleServiceImpl.java

@@ -367,6 +367,7 @@ public class UserRoleServiceImpl implements UserRoleService {
             }
             if (userRoleSearchEntity.getMerchantId() != null) {
                 predicates.add(cb.equal(root.get("merchantId"), userRoleSearchEntity.getMerchantId()));
+                predicates.add(cb.equal(root.get("isSysCreate"), 0));
             }
             //创建一个条件的集合，长度为上面满足条件的个数
             Predicate[] pre = new Predicate[predicates.size()];
@@ -408,7 +409,8 @@ public class UserRoleServiceImpl implements UserRoleService {
     public List<UserAllRoleDto> getListInfo(Integer merchantId) throws ServiceException {
         List<UserRoleTable> roleTables = new ArrayList<>();
         if(merchantId != null){
-            roleTables = userRoleRepository.findAllByMerchantId(merchantId);
+            Integer isSysCreate = 0;
+            roleTables = userRoleRepository.findAllByMerchantIdAndIsSysCreate(merchantId,isSysCreate);
         }else {
             roleTables = userRoleRepository.findAll();
         }

ucard-core/src/main/java/com/crm/rely/backend/core/entity/user/role/UserRoleAddEntity.java

@@ -25,6 +25,9 @@ public class UserRoleAddEntity extends BaseAddEntity {
 
     private String content;
 
+    // 是否是系统人员创建 0：否；1：是
+    private Integer isSysCreate;
+
     /**
      * 商户ID
      */

ucard-core/src/main/java/com/crm/rely/backend/core/pojo/table/UserRoleTable.java

@@ -31,4 +31,9 @@ public class UserRoleTable extends BaseTable {
     private Integer number;
 
     private Integer merchantId;
+
+    /**
+     * 是否系统用户创建 0：否 ； 1：是
+     */
+    private Integer isSysCreate;
 }