用户管理导入功能开发 用水类型赋值错误处理，id 存入 key ,type 存入 name

zhsw-common/src/main/java/com/rongwei/zhsw/system/importListener/UserManagementRecordListener.java

@@ -198,18 +198,13 @@ public class UserManagementRecordListener extends AnalysisEventListener<ImportUs
                     .orElse(null));
 
             //用户类别
-            saveUserDo.setUsertype(Optional.ofNullable(usertypeMap.get(recordVo.getUsertypename()))
-                    .orElse(new ArrayList<>())
-                    .stream()
-                    .findFirst()
-                    .map(SwPreferentialUserCategoriesVo::getDiscounttype)
-                    .orElse(null));
+            saveUserDo.setUsertype(recordVo.getUsertypename());
 
             saveUserDo.setUsertypeid(Optional.ofNullable(usertypeMap.get(recordVo.getUsertypename()))
                     .orElse(new ArrayList<>())
                     .stream()
                     .findFirst()
-                    .map(SwPreferentialUserCategoriesVo::getId)
+                    .map(SwPreferentialUserCategoriesVo::getDiscounttype)
                     .orElse(null));
 
            //EXEMPTIONWATER  减免用水   根据  用户类别 进行更新为对应减免用水