Merge remote-tracking branch 'origin/ythcj_hainan' into ythcj_hainan

src/main/java/com/founder/controller/TbXwRycjController.java

@@ -930,13 +930,13 @@ public class TbXwRycjController {
         zbfzxyr.setLrdwmc(user.getUnitname());
         zbfzxyr.setLrr(user.getUsername());
         //zbfzxyr.setXxdjryLxdh(user.getTelephone());
-        String ips = "";
-        try {
-            ips = SysUitl.getIp(request);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if(ips!=null&&!"".equals(ips)){
+        String ips = zbfzxyr.getIp();
+        if(ips==null||"".equals(ips)){
+            try {
+                ips = SysUitl.getIp(request);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             zbfzxyr.setIp(ips);
         }
         boolean bool = rycjService.insertRyxx(zbfzxyr);
@@ -1062,13 +1062,13 @@ public class TbXwRycjController {
 
     @RequestMapping("/doEditRyxx")
     public String doEditYsseryxx(AutoTbStRy zbfzxyr,String cjsb,String hmzt,String zjzt,String swzt,String sjzt,String yhkzt,String sswpzt, Model model, HttpServletRequest request, @RequestParam("R_EDZZP_File") MultipartFile R_EDZZP_File,@RequestParam("R_ZMZP_File") MultipartFile R_ZMZP_File,MultipartFile R_CMZP_File,MultipartFile R_YCMZP_File){
-        String ips = "";
-        try {
-            ips = SysUitl.getIp(request);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if(ips!=null&&!"".equals(ips)){
+        String ips = zbfzxyr.getIp();
+        if(ips==null||"".equals(ips)){
+            try {
+                ips = SysUitl.getIp(request);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             zbfzxyr.setIp(ips);
         }
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd");