Merge branch 'developer' into 'master'

Developer

See merge request !4

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexDescMapper.java

@@ -67,5 +67,5 @@ public interface TabIndexDescMapper {
 
     List<TabIndexDesc> listByIds(@Param("ids") List<Integer> indexDescIdList);
 
-    TabIndexDesc getIndexDescByIndexCode(@Param("moduleId") String moduleId, @Param("indexCode") String indexCode);
+    TabIndexDesc getIndexDescByIndexCode(@Param("moduleId") String moduleId, @Param("indexCode") String indexCode, @Param("indexGroupName") String indexGroupName);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/service/IndexDescService.java

@@ -27,7 +27,7 @@ public interface IndexDescService {
 
     List<TabIndexDesc> listByIds(List<Integer> indexDescIdList);
 
-    TabIndexDesc getIndexDesc(String moduleId, String indexCode);
+    TabIndexDesc getIndexDesc(String moduleId, String indexCode, String indexGroupName);
 
     void init(Integer enterpriseId);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexDescServiceImpl.java

@@ -64,8 +64,8 @@ public class IndexDescServiceImpl implements IndexDescService {
     }
 
     @Override
-    public TabIndexDesc getIndexDesc(String moduleId, String indexCode) {
-        return tabIndexDescMapper.getIndexDescByIndexCode(moduleId, indexCode);
+    public TabIndexDesc getIndexDesc(String moduleId, String indexCode, String indexGroupName) {
+        return tabIndexDescMapper.getIndexDescByIndexCode(moduleId, indexCode, indexGroupName);
     }
 
     @Override

gic-data-cloud-service/src/main/java/com/gic/cloud/service/outer/impl/IndexDescApiServiceImpl.java

@@ -73,7 +73,7 @@ public class IndexDescApiServiceImpl implements IndexDescApiService {
     @Override
     public ServiceResponse<IndexDTO> getIndexDesc(Integer enterpriseId, String moduleId, String indexGroupName, String indexCode) {
 //        TabIndex index = indexService.getByIndexCode(moduleId, indexCode);
-        TabIndexDesc indexDesc = indexDescService.getIndexDesc(moduleId, indexCode);
+        TabIndexDesc indexDesc = indexDescService.getIndexDesc(moduleId, indexCode, indexGroupName);
         List<Integer> list = indexModuleRelService.listBusinessIdByModuleId(indexDesc.getIndexDescId().toString(), LogAndUpdateTipsTypeEnum.INDEX.getCode());
         if (CollectionUtils.isNotEmpty(list)) {
             Integer indexId = list.get(0);

gic-data-cloud-service/src/main/resources/mapper/TabIndexDescMapper.xml

@@ -234,6 +234,6 @@
   <select id="getIndexDescByIndexCode" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
-    from tab_index_desc where status = 1 and module_id = #{moduleId} and index_code = #{indexCode}
+    from tab_index_desc where status = 1 and module_id = #{moduleId} and index_code = #{indexCode} and index_group_name = #{indexGroupName} limit 1
   </select>
 </mapper>
\ No newline at end of file

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/LoginController.java

@@ -49,7 +49,7 @@ public class LoginController {
             List<Integer> enterpriseIdList = userDTOList.stream().map(userDTO -> userDTO.getEnterpriseId()).collect(Collectors.toList());
             List<EnterpriseDTO> enterpriseDTOList = this.enterpriseApiService.listEnterpriseByIds(enterpriseIdList).getResult();
             Integer enterpriseId = userDTOList.get(0).getEnterpriseId();
-            String code = CreateRandomUtils.getStringRandom(4);
+            String code = CreateRandomUtils.generateNumberStr(4);
             ServiceResponse<Void> smsSendResult = smsSendApiService.sendPlatformSms(smsSenceId,enterpriseId,areaCode, phoneNumber, new String[]{code});
             if(smsSendResult.isSuccess()){
                 String key = "GYTCode:" + areaCode + ":" + phoneNumber;