调整

fangchan_manager/src/main/java/com/mw/platform/common/TyrzptConstants.java

@@ -9,8 +9,7 @@ public class TyrzptConstants {
     /**
      * 内网地址
      */
-    public static final String N_URL = "http://172.16.1.152:8090/";
-//    public static final String N_URL = "http://localhost:8088/";
+    public static final String N_URL = "http://172.17.1.48:8090/";
 
     /**
      * 外网地址
@@ -25,7 +24,7 @@ public class TyrzptConstants {
     /**
      * 政务网地址
      */
-    public static final String Z_URL = "http://172.16.1.152:8090/";
+    public static final String Z_URL = "http://172.17.1.48:8090/";
 
     /**
      * ukey登陆地址

fangchan_manager/src/main/java/com/mw/platform/controller/TokenLoginController.java

@@ -99,7 +99,7 @@ public class TokenLoginController extends BaseController {
 							fljg.setU(userInfo.getId());
 							orgList.add(fljg);
 							for (SysUserInfo sonUser : sonList) {
-								Organization sonOrg = organizationService.selectByPrimaryKey(userInfo.getGroupId());
+								Organization sonOrg = organizationService.selectByPrimaryKey(sonUser.getGroupId());
 								sonOrg.setU(sonUser.getId());
 								orgList.add(sonOrg);
 							}
@@ -109,26 +109,8 @@ public class TokenLoginController extends BaseController {
 							view.setViewName("checkOrg");
 							return view;
 						}
-
-
-//						//如果同一账号绑定多个机构 跳转选择机构页面
-//						if (userInfo.getOrgids() != null && userInfo.getOrgids().split(",").length>1){
-//							String[] strings = userInfo.getOrgids().split(",");
-//							Integer[] idsArr = new Integer[strings.length];
-//							for (int i=0;i<strings.length;i++){
-//								idsArr[i] = Integer.valueOf(strings[i]);
-//							}
-//							List<Organization> orgList = organizationService.selectByIds(idsArr);
-//							view.addObject("orgList",orgList);
-//							view.addObject("tyyhid",loginUser.getTyyhId());
-//							view.addObject("token",token);
-//							view.addObject("wl",wl);
-//							view.setViewName("checkOrg");
-//							return view;
-//						}
 					}
 				}
-
 				//shiro
 				Subject subject = SecurityUtils.getSubject();
 				UsernamePasswordToken t = new UsernamePasswordToken(userInfo.getAccount(), userInfo.getPassword());
@@ -152,34 +134,6 @@ public class TokenLoginController extends BaseController {
 		}
 	}
 
-	/**
-	 * checkOrg
-	 * @param tyyhid
-	 * @return
-	 * @throws Exception
-	 */
-	@Log(operationType = OperationType.TOKEN_LOGIN , title = "选择登陆机构")
-	@RequestMapping(value = "/checkOrg", method = RequestMethod.GET)
-	public ModelAndView checkOrg(String tyyhid,Integer orgid) {
-		SysUserInfo userInfo = service.checkByTyyhId(tyyhid);
-		userInfo.setGroupId(orgid);
-		//shiro
-		Subject subject = SecurityUtils.getSubject();
-		UsernamePasswordToken t = new UsernamePasswordToken(userInfo.getAccount(), userInfo.getPassword());
-		subject.login(t);
-		// 生成session
-		setSysUserInfo(userInfo);
-		ModelAndView view = new ModelAndView();
-		view.addObject("title", title);
-		view.addObject("copyright", copyright);
-		view.setViewName("main");
-		return view;
-//		BaseParameter result = new BaseParameter();
-//		result.commit();
-//		return result.toString();
-	}
-
-
 	/**
 	 * 调用用户认证平台接口，获取用户信息
 	 * @param token
@@ -187,7 +141,6 @@ public class TokenLoginController extends BaseController {
 	 */
 	private LoginUser getPtUser(String token,String wl){
 		LoginUser loginUser = null;
-
 		String url = TyrzptConstants.N_URL+TyrzptConstants.GET_USER+"?token="+token;
 
 		//发送请求
@@ -208,7 +161,6 @@ public class TokenLoginController extends BaseController {
 			loginUser = new LoginUser();
 			loginUser.setCode("202");
 			loginUser.setMsg("用户登录失败");
-
 		} else {
 			JSONObject jdata = jsonO.getJSONObject("data");
 			Map<String, Object> dataMap = (Map<String, Object>) JSON.parse(jdata.toString());
@@ -219,8 +171,6 @@ public class TokenLoginController extends BaseController {
 		return loginUser;
 	}
 
-
-
 	/**
 	 * 返回主页
 	 * @param wl
@@ -243,8 +193,6 @@ public class TokenLoginController extends BaseController {
 		return new ModelAndView("error/202");
 	}
 
-
-
 	@Override
 	public String getPagePath() {
 		return null;

fangchan_manager/src/main/resources/static/js/business/organization/list.js

@@ -115,9 +115,6 @@ layui.use(['table','form', 'util'], function() {
 	});
 
 	window.getJglx = function (jglx){
-		console.log(jglx);
-		console.log(arr);
-
 		for (var i=0;i<arr.length;i++){
 			if (parseInt(jglx) === parseInt(arr[i].dictKey)){
 				console.log(arr[i].dictValue);

fangchan_manager/src/main/resources/static/js/business/organization/zybaxq.js

@@ -18,7 +18,7 @@ layui.use([ 'table','table'], function() {
 		}
 		var data = checkStatus.data[0];
 		if (parseInt(data.jglx) !== 1){
-			layer.alert('仅房地产经纪机构可以查询执业备案详情', {
+			layer.alert('仅备案可以查询执业备案详情', {
 				icon : 0
 			});
 			return;

fangchan_manager/src/main/resources/templates/business/organization/add.html

@@ -388,7 +388,7 @@
 				number = 3;
 				msg = "审核成功";
 			}else if(shzt == '2'){
-				var remark = '${(organization.bz)! }';
+				var remark = '${(organization.xxbabz)! }';
 				number = 3;
 				msg = "审核失败<div class='layui-layer-tips' style='position: absolute;pointer-events: auto;'>"
 						+ "<div class='layui-layer-content' style='background-color:#FF5722;'>"

fangchan_manager/src/main/resources/templates/business/organization/addOrgBaseInfo.html

@@ -41,9 +41,9 @@ form input.layui-input[disabled] {
 				<label class="layui-form-label">机构类型：</label>
 				<div class="layui-input-block">
 					<select class="layui-select" id="jglx" lay-verify="required">
-						<option value="1">房地产经纪机构</option>
-						<option value="2">房地产评估机构</option>
-						<option value="3">房地产开发企业</option>
+						<option value="1">备案机构</option>
+						<option value="2">登记机构</option>
+						<option value="3">加盟机构</option>
 					</select>
 				</div>
 			</div>

fangchan_manager/src/main/resources/templates/business/organization/list.html

@@ -35,9 +35,9 @@
 							<div class="layui-input-inline">
 								<select id="jglx">
 									<option value=""></option>
-									<option value="1">房地产经纪机构</option>
-									<option value="2">房地产评估机构</option>
-									<option value="3">房地产开发企业</option>
+									<option value="1">备案机构</option>
+									<option value="2">登记机构</option>
+									<option value="3">加盟机构</option>
 								</select>
 							</div>
 						</div>

fangchan_mybatis/src/main/resources/mapper/business/mysql/OrganizationMapper.xml

@@ -195,7 +195,7 @@
   <!-- 主键查询单条记录 -->
   <select id="selectByPrimaryKey" resultType="com.mw.platform.business.mysql.entity.Organization" parameterType="java.lang.Integer" >
     SELECT t.id, t.code, t.jglx, t.fljg, t.fljgmc, t.shtyxydm, t.jgmc,t. zczj, t.clsj, t.jjfw, t.jgfr,
-    t.frdh,t.xxbazt,t.xxbasj,t.xxbadqsj, t.frsfz, t.jgyyzz, t.frsfzz, t.frsfzf, t.hylx, t.rhsj, t.hyzh, t.lxr,
+    t.frdh,t.xxbazt,t.xxbabz,t.xxbasj,t.xxbadqsj, t.frsfz, t.jgyyzz, t.frsfzz, t.frsfzf, t.hylx, t.rhsj, t.hyzh, t.lxr,
     t.lxdh, t.gsdz, t.dzyx,t.zybazt,t.zybasj,t.zybakssj,t.zybadqsj,t.xxbabh,t.zybabz,t.cxfs,t.cxdj,t.jd,t.wd
     FROM t_organization t
     WHERE t.id = #{id,jdbcType=INTEGER}