fix 报错

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysUserDataImpl.java

@@ -100,32 +100,59 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
 
     @Override
     public SysUser selectByPhonenumber(String phonenumber) {
-        return null;
+        TbSysUser ret = jpaQueryFactory.select(tbSysUser).from(tbSysUser)
+                .where(PredicateBuilder.instance()
+                        .and(tbSysUser.phonenumber.eq(phonenumber))
+                        .build()).fetchOne();
+        return MapstructUtils.convert(ret, SysUser.class);
     }
 
     @Override
     public SysUser selectTenantUserByPhonenumber(String phonenumber, String tenantId) {
-        return null;
+        TbSysUser ret = jpaQueryFactory.select(tbSysUser).from(tbSysUser)
+                .where(PredicateBuilder.instance()
+                        .and(tbSysUser.phonenumber.eq(phonenumber))
+                        .and(tbSysUser.tenantId.eq(tenantId))
+                        .build()).fetchOne();
+        return MapstructUtils.convert(ret, SysUser.class);
     }
 
     @Override
     public SysUser selectTenantUserByEmail(String email, String tenantId) {
-        return null;
+        TbSysUser ret = jpaQueryFactory.select(tbSysUser).from(tbSysUser)
+                .where(PredicateBuilder.instance()
+                        .and(tbSysUser.email.eq(email))
+                        .and(tbSysUser.tenantId.eq(tenantId))
+                        .build()).fetchOne();
+        return MapstructUtils.convert(ret, SysUser.class);
     }
 
     @Override
     public SysUser selectUserByEmail(String email) {
-        return null;
+        TbSysUser ret = jpaQueryFactory.select(tbSysUser).from(tbSysUser)
+                .where(PredicateBuilder.instance()
+                        .and(tbSysUser.email.eq(email))
+                        .build()).fetchOne();
+        return MapstructUtils.convert(ret, SysUser.class);
     }
 
     @Override
     public SysUser selectTenantUserByUserName(String username, String tenantId) {
-        return null;
+        TbSysUser ret = jpaQueryFactory.select(tbSysUser).from(tbSysUser)
+                .where(PredicateBuilder.instance()
+                        .and(tbSysUser.userName.eq(username))
+                        .and(tbSysUser.tenantId.eq(tenantId))
+                        .build()).fetchOne();
+        return MapstructUtils.convert(ret, SysUser.class);
     }
 
     @Override
     public SysUser selectUserByUserName(String username) {
-        return null;
+         TbSysUser ret = jpaQueryFactory.select(tbSysUser).from(tbSysUser)
+                .where(PredicateBuilder.instance()
+                        .and(tbSysUser.userName.eq(username))
+                        .build()).fetchOne();
+         return MapstructUtils.convert(ret, SysUser.class);
     }
 
     @Override

iot-module/iot-system/src/main/java/cc/iotkit/system/config/AutoMapperConfig.java

@@ -10,6 +10,5 @@ import io.github.linpeilie.annotations.MapperConfig;
  * @Description: mapperstruct 配置
  */
 @MapperConfig(mapperPackage = "cc.iotkit.system.dto")
-@ComponentModelConfig(componentModel = "default")
 public class AutoMapperConfig {
 }

iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysTenantPackageBo.java

@@ -36,7 +36,7 @@ public class SysTenantPackageBo extends BaseDto {
     /**
      * 关联菜单id
      */
-    @AutoMapping(target = "menuIds", expression = "java(cc.iotkit.common.core.utils.StringUtils.join(source.getMenuIds(), \",\"))")
+    @AutoMapping(target = "menuIds", expression = "java(cc.iotkit.common.utils.StringUtils.join(source.getMenuIds(), \",\"))")
     private Long[] menuIds;
 
     /**