Merge remote-tracking branch 'origin/dev1.0' into dev1.0

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_MdmController.java

@@ -707,6 +707,7 @@ public class Api_MdmController {
         employeeInfo.setDzysbz(jsonObject.get("dzysbz").toString());
         employeeInfo.setKzrshqx(jsonObject.get("kzrshqx").toString());
         employeeInfo.setKfcfq(jsonObject.get("kfcfq").toString());
+        employeeInfo.setRoleIds(new Long[]{4l});
         boolean issuccess=false;
         if(count>0){
             //修改
@@ -729,7 +730,7 @@ public class Api_MdmController {
             employeeInfo.setDelFlag("0");
             employeeInfo.setCreateBy("admin");
             employeeInfo.setCreateTime(new Date());
-            boolean result = userService.save(employeeInfo);
+            boolean result = userService.insertUser(employeeInfo);
             if (result) {
                 issuccess=true;
             } else {